diff --git a/app/packs/src/apps/mydb/elements/details/vessels/VesselDetails.js b/app/packs/src/apps/mydb/elements/details/vessels/VesselDetails.js
index dfc6b1d443..5b947a99b1 100644
--- a/app/packs/src/apps/mydb/elements/details/vessels/VesselDetails.js
+++ b/app/packs/src/apps/mydb/elements/details/vessels/VesselDetails.js
@@ -4,6 +4,7 @@ import ElementActions from 'src/stores/alt/actions/ElementActions';
 import ElementCollectionLabels from 'src/apps/mydb/elements/labels/ElementCollectionLabels';
 import { observer } from 'mobx-react';
 import DetailActions from 'src/stores/alt/actions/DetailActions';
+import CollectionUtils from 'src/models/collection/CollectionUtils';
 import PropTypes from 'prop-types';
 import UIStore from 'src/stores/alt/stores/UIStore';
 import UserStore from 'src/stores/alt/stores/UserStore';
@@ -12,16 +13,19 @@ import VesselProperties from 'src/apps/mydb/elements/details/vessels/propertiesT
 import VesselAttachmentsContainer from "src/apps/mydb/elements/details/vessels/attachmentsTab/VesselAttachmentsContainer";
 
 function VesselDetails({ vesselItem, toggleFullScreen }) {
-
   const isReadOnly = () => {
     const { currentCollection, isSync } = UIStore.getState();
     const { currentUser } = UserStore.getState();
+    return CollectionUtils.isReadOnly(
+      currentCollection,
+      currentUser.id,
+      isSync
+    );
   };
   const context = useContext(StoreContext);
   const [activeTab, setActiveTab] = useState('tab1');
   const [readOnly, setReadOnly] = useState(isReadOnly());
 
-
   useEffect(() => {
     context.vesselDetailsStore.convertVesselToModel(vesselItem);
     setReadOnly(isReadOnly());
@@ -68,7 +72,6 @@ function VesselDetails({ vesselItem, toggleFullScreen }) {
     const { vesselDetailsStore } = context;
     const mobXItem = vesselDetailsStore.getVessel(vesselItem.id);
     const disabled = false;
-    // if (disabled) { return null; }
 
     const action = closeAfterClick
       ? () => { handleSubmit(vesselItem); DetailActions.close(vesselItem, true); }
diff --git a/app/packs/src/apps/mydb/elements/details/vessels/attachmentsTab/AttachmentsModal.js b/app/packs/src/apps/mydb/elements/details/vessels/attachmentsTab/AttachmentsModal.js
deleted file mode 100644
index 6898eddd4b..0000000000
--- a/app/packs/src/apps/mydb/elements/details/vessels/attachmentsTab/AttachmentsModal.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/* eslint-disable react/function-component-definition */
-import React, { useState, useRef } from 'react';
-import PropTypes from 'prop-types';
-import {
-  Modal, Button,
-} from 'react-bootstrap';
-import AttachmentsModalContent from 'src/apps/mydb/elements/details/vessels/attachmentsTab/AttachmentsModalContent';
-
-const AttachmentsModal = ({
-  show, onHide, onChange, readOnly = false, disabled = false, kind = null, datasetContainer,
-}) => {
-  const datasetInput = useRef(null);
-  const [isNameEditing, setIsNameEditing] = useState(false);
-  const [localName, setLocalName] = useState(datasetContainer.name);
-
-  const handleSave = () => {
-    if (datasetInput.current) {
-      datasetInput.current.handleSave();
-      const updatedAttachments = datasetInput.current.getUpdatedAttachments();
-      const updatedDatasetContainer = {
-        ...datasetContainer,
-        attachments: updatedAttachments,
-        name: localName,
-      };
-      onChange(updatedDatasetContainer);
-      onHide();
-    }
-  };
-
-  const handleModalClose = (event) => {
-    if (event && event.type === 'keydown' && event.key === 'Escape') {
-      handleSave();
-    } else {
-      onHide();
-    }
-  };
-
-  const handleNameChange = (newName) => {
-    setLocalName(newName);
-  };
-
-  const toggleNameEditing = () => {
-    setIsNameEditing((prev) => !prev);
-  };
-
-  if (show) {
-    return (
-      <Modal
-        centered
-        show={show}
-        size="xl"
-        onHide={() => (disabled ? onHide() : handleModalClose())}
-      >
-        <Modal.Header>
-          <Modal.Title className="d-flex justify-content-between align-items-center w-100">
-            {isNameEditing ? (
-              <div className="d-flex flex-grow-1 align-items-center">
-                <input
-                  type="text"
-                  value={localName}
-                  onBlur={toggleNameEditing}
-                  onKeyPress={(event) => {
-                    if (event.key === 'Enter') {
-                      handleNameChange(event.target.value);
-                      toggleNameEditing();
-                    }
-                  }}
-                  onChange={(e) => { handleNameChange(e.target.value); }}
-                />
-              </div>
-            ) : (
-              <div className="d-flex flex-grow-1">
-                <span className="me-2">{localName}</span>
-                {!readOnly && (
-                  <i
-                    className="fa fa-pencil text-primary mt-1"
-                    aria-hidden="true"
-                    onClick={toggleNameEditing}
-                    role="button"
-                  />
-                )}
-              </div>
-            )}
-          </Modal.Title>
-        </Modal.Header>
-        <Modal.Body>
-          <AttachmentsModalContent
-            ref={datasetInput}
-            readOnly={false}
-            datasetContainer={datasetContainer}
-            onModalHide={onHide}
-            onChange={onChange}
-          />
-        </Modal.Body>
-        <Modal.Footer className="d-flex justify-content-between align-items-center modal-footer border-0">
-          <div>
-            <small>
-              Changes are kept for this session. Remember to save the element itself to persist changes.
-            </small>
-          </div>
-          <Button
-            variant="primary"
-            className="align-self-center ms-auto"
-            onClick={handleSave}
-          >
-            Keep Changes
-          </Button>
-        </Modal.Footer>
-      </Modal>
-    );
-  }
-  return null;
-};
-
-AttachmentsModal.propTypes = {
-  show: PropTypes.bool.isRequired,
-  datasetContainer: PropTypes.shape({
-    name: PropTypes.string.isRequired,
-    extended_metadata: PropTypes.shape({
-      instrument: PropTypes.string,
-    }),
-  }).isRequired,
-  onHide: PropTypes.func.isRequired,
-  onChange: PropTypes.func.isRequired,
-  readOnly: PropTypes.bool,
-  disabled: PropTypes.bool,
-  kind: PropTypes.string,
-};
-
-export default AttachmentsModal;
diff --git a/app/packs/src/apps/mydb/elements/details/vessels/attachmentsTab/AttachmentsModalContent.js b/app/packs/src/apps/mydb/elements/details/vessels/attachmentsTab/AttachmentsModalContent.js
deleted file mode 100644
index bd632e80cc..0000000000
--- a/app/packs/src/apps/mydb/elements/details/vessels/attachmentsTab/AttachmentsModalContent.js
+++ /dev/null
@@ -1,177 +0,0 @@
-/* eslint-disable react/display-name */
-/* eslint-disable arrow-body-style */
-import React, { useImperativeHandle, forwardRef, useState } from 'react';
-import PropTypes from 'prop-types';
-import { Button, ButtonToolbar } from 'react-bootstrap';
-import Dropzone from 'react-dropzone';
-import SaveEditedImageWarning from 'src/apps/mydb/elements/details/researchPlans/SaveEditedImageWarning';
-import {
-  downloadButton,
-  removeButton,
-  annotateButton,
-  formatFileSize,
-  attachmentThumbnail,
-} from 'src/apps/mydb/elements/list/AttachmentList';
-import { formatDate } from 'src/utilities/timezoneHelper';
-import ImageAnnotationModalSVG from 'src/apps/mydb/elements/details/researchPlans/ImageAnnotationModalSVG';
-import { observer } from 'mobx-react';
-
-const classifyAttachments = (attachments) => {
-  return {
-    Pending: attachments.filter((attachment) => attachment.is_pending && !attachment.is_deleted) || [],
-    Original: attachments.filter((attachment) => !attachment.is_pending && !attachment.is_deleted) || [],
-  };
-};
-
-const AttachmentsModalContent = forwardRef(({ datasetContainer, onChange, readOnly }, ref) => {
-  const [attachments, setAttachments] = useState([...datasetContainer.attachments]);
-  const [attachmentGroups, setAttachmentGroups] = useState(classifyAttachments(datasetContainer.attachments));
-  const [imageEditModalShown, setImageEditModalShown] = useState(false);
-  const [chosenAttachment, setChosenAttachment] = useState(null);
-
-  const updateAttachments = (newAttachments) => {
-    setAttachments(newAttachments);
-    setAttachmentGroups(classifyAttachments(newAttachments));
-    onChange({ ...datasetContainer, attachments: newAttachments });
-  };
-
-  useImperativeHandle(ref, () => ({
-    handleSave: () => {
-      const savedAttachments = attachments.map((attachment) => ({
-        ...attachment,
-        is_pending: false,
-      }));
-      setAttachments(savedAttachments);
-      setAttachmentGroups(classifyAttachments(savedAttachments));
-      onChange({ ...datasetContainer, attachments: savedAttachments });
-    },
-    getUpdatedAttachments: () => attachments,
-  }));
-
-  const handleFileDrop = (files) => {
-    const newAttachments = files.map((file) => ({
-      id: Date.now(),
-      filename: file.name,
-      filesize: file.size,
-      is_pending: true,
-      is_deleted: false,
-    }));
-
-    const updatedAttachments = [...attachments, ...newAttachments];
-    updateAttachments(updatedAttachments);
-  };
-
-  const handleAttachmentRemove = (attachment) => {
-    const updatedAttachments = attachments.map((a) => (a.id === attachment.id ? { ...a, is_deleted: true } : a));
-    updateAttachments(updatedAttachments);
-  };
-
-  const handleUndo = (attachment) => {
-    const updatedAttachments = attachments.map((a) => (a.id === attachment.id ? { ...a, is_deleted: false } : a));
-    updateAttachments(updatedAttachments);
-  };
-
-  const renderAttachmentRow = (attachment) => (
-    <div className="attachment-row" key={attachment.id}>
-      {attachmentThumbnail(attachment)}
-      <div className="attachment-row-text" title={attachment.filename}>
-        {attachment.is_deleted ? <strike>{attachment.filename}</strike> : attachment.filename}
-        <div className="attachment-row-subtext">
-          <div>
-            Created:
-            {' '}
-            <span className="ms-1">
-              {formatDate(attachment.created_at || Date.now())}
-              {' '}
-            </span>
-          </div>
-          <span className="ms-2 me-2">|</span>
-          <div>
-            Size:
-            <span className="fw-bold text-gray-700 ms-1">
-              {formatFileSize(attachment.filesize)}
-            </span>
-          </div>
-        </div>
-      </div>
-      <div className="attachment-row-actions d-flex justify-content-end align-items-center gap-1">
-        {attachment.is_deleted ? (
-          <Button
-            size="sm"
-            variant="danger"
-            className="attachment-button-size"
-            onClick={() => handleUndo(attachment)}
-          >
-            <i className="fa fa-undo" aria-hidden="true" />
-          </Button>
-        ) : (
-          <ButtonToolbar className="gap-1">
-            {downloadButton(attachment)}
-            {annotateButton(attachment, () => {
-              setImageEditModalShown(true);
-              setChosenAttachment(attachment);
-            })}
-            {removeButton(attachment, handleAttachmentRemove, readOnly)}
-          </ButtonToolbar>
-        )}
-      </div>
-      {attachment.updatedAnnotation && <SaveEditedImageWarning visible />}
-    </div>
-  );
-
-  const renderGroup = (attachments, title) => (
-    <div key={title} className="mt-2">
-      <div className="fw-bold mb-2 border rounded p-1" style={{ backgroundColor: '#D3D3D3' }}>
-        {title}
-      </div>
-      {attachments.map((attachment) => renderAttachmentRow(attachment))}
-    </div>
-  );
-
-  const renderAttachments = () => (
-    <div className="p-2 border rounded">
-      {imageEditModalShown && (
-        <ImageAnnotationModalSVG
-          attachment={chosenAttachment}
-          isShow={imageEditModalShown}
-          handleSave={() => setImageEditModalShown(false)}
-          handleOnClose={() => setImageEditModalShown(false)}
-        />
-      )}
-      <div className="d-flex justify-content-between align-items-center">
-        <Dropzone onDrop={handleFileDrop} className="attachment-dropzone">
-          Drop files here, or click to upload.
-        </Dropzone>
-      </div>
-      {attachmentGroups.Pending.length === 0 && attachmentGroups.Original.length === 0 ? (
-        <div className="no-attachments-text">There are currently no attachments.</div>
-      ) : (
-        <>
-          {attachmentGroups.Pending.length > 0
-            && renderGroup(attachmentGroups.Pending, 'Pending')}
-          {attachmentGroups.Original.length > 0
-            && renderGroup(attachmentGroups.Original, 'Original')}
-        </>
-      )}
-    </div>
-  );
-  return <div>{renderAttachments()}</div>;
-});
-
-AttachmentsModalContent.propTypes = {
-  datasetContainer: PropTypes.shape({
-    attachments: PropTypes.arrayOf(
-      PropTypes.shape({
-        id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-        filename: PropTypes.string.isRequired,
-        filesize: PropTypes.number.isRequired,
-        is_deleted: PropTypes.bool,
-      })
-    ),
-  }).isRequired,
-  onChange: PropTypes.func.isRequired,
-  readOnly: PropTypes.bool,
-  disabled: PropTypes.bool,
-};
-
-export default observer(AttachmentsModalContent);
diff --git a/app/packs/src/apps/mydb/elements/details/vessels/propertiesTab/VesselProperties.js b/app/packs/src/apps/mydb/elements/details/vessels/propertiesTab/VesselProperties.js
index cef794edc4..3c37fdf6d3 100644
--- a/app/packs/src/apps/mydb/elements/details/vessels/propertiesTab/VesselProperties.js
+++ b/app/packs/src/apps/mydb/elements/details/vessels/propertiesTab/VesselProperties.js
@@ -6,19 +6,16 @@ import PropTypes from 'prop-types';
 import { StoreContext } from 'src/stores/mobx/RootStore';
 import VesselProperty from 'src/apps/mydb/elements/details/vessels/propertiesTab/VesselProperty';
 import VesselName from 'src/apps/mydb/elements/details/vessels/propertiesTab/VesselName';
-// import InvalidPropertyWarning from 'src/apps/mydb/elements/details/cellLines/propertiesTab/InvalidPropertyWarning';
 
 const VesselProperties = ({ item, readOnly }) => {
   const { vesselDetailsStore } = useContext(StoreContext);
   const vesselId = item.id;
-  // const vesselItem = vesselDetailsStore.vessels.get(vesselId);
   const vesselItem = vesselDetailsStore.getVessel(vesselId);
 
   return (
     <Accordion className="vessel-properties" defaultActiveKey="common-properties">
       <Accordion.Item eventKey="common-properties">
         <Accordion.Header>
-          {/* <InvalidPropertyWarning item={item} propsToCheck={['name', 'material_type']} /> */}
           Common vessel properties
         </Accordion.Header>
         <Accordion.Body>
@@ -31,27 +28,27 @@ const VesselProperties = ({ item, readOnly }) => {
             label="Details"
             value={vesselItem?.details || ''}
             onChange={(e) => vesselDetailsStore.changeDetails(vesselId, e.target.value)}
-            // readOnly={readOnly}
+            readOnly={readOnly}
             optional
           />
           <VesselProperty
             label="Material type"
             value={vesselItem?.materialType || ''}
             onChange={(e) => vesselDetailsStore.changeMaterialType(vesselId, e.target.value)}
-            // readOnly={readOnly}
+            readOnly={readOnly}
           />
           <VesselProperty
             label="Vessel type"
             value={vesselItem?.vesselType || ''}
             onChange={(e) => vesselDetailsStore.changeVesselType(vesselId, e.target.value)}
-            // readOnly={readOnly}
+            readOnly={readOnly}
             optional
           />
           <VesselProperty
             label="Volume amount"
             value={vesselItem?.volumeAmount || 0}
             onChange={(e) => vesselDetailsStore.changeVolumeAmount(vesselId, parseFloat(e.target.value))}
-            // readOnly={readOnly}
+            readOnly={readOnly}
             isNumeric
             optional
           />
@@ -59,14 +56,14 @@ const VesselProperties = ({ item, readOnly }) => {
             label="Volume unit"
             value={vesselItem?.volumeUnit || ''}
             onChange={(e) => vesselDetailsStore.changeVolumeUnit(vesselId, e.target.value)}
-            // readOnly={readOnly}
+            readOnly={readOnly}
             optional
           />
           <VesselProperty
             label="Weight amount"
             value={vesselItem?.weightAmount || 0}
             onChange={(e) => vesselDetailsStore.changeWeightAmount(vesselId, parseFloat(e.target.value))}
-            // readOnly={readOnly}
+            readOnly={readOnly}
             isNumeric
             optional
           />
@@ -82,7 +79,6 @@ const VesselProperties = ({ item, readOnly }) => {
 
       <Accordion.Item eventKey="specific-properties">
         <Accordion.Header>
-          {/* <InvalidPropertyWarning item={item} propsToCheck={['passage', 'amount', 'unit']} /> */}
           Item specific vessel properties
         </Accordion.Header>
         <Accordion.Body>
diff --git a/app/packs/src/apps/mydb/elements/details/vessels/propertiesTab/VesselProperty.js b/app/packs/src/apps/mydb/elements/details/vessels/propertiesTab/VesselProperty.js
index 20803aed27..4dcfb60399 100644
--- a/app/packs/src/apps/mydb/elements/details/vessels/propertiesTab/VesselProperty.js
+++ b/app/packs/src/apps/mydb/elements/details/vessels/propertiesTab/VesselProperty.js
@@ -1,40 +1,32 @@
 /* eslint-disable react/function-component-definition */
-import React, {useState} from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Row, Col, Form } from 'react-bootstrap';
 
-const VesselProperty = ({ label, value, onChange, readOnly, isNumeric = false, optional = false }) => {
-  const [typing, setTyping] = useState(false);
+const VesselProperty = ({ label, value, onChange, readOnly, isNumeric = false, optional = false }) => (
+  <Form.Group as={Row} className="mt-3">
+    <Form.Label column sm={3}>{label}</Form.Label>
+    <Col sm={9}>
+      <Form.Control
+        disabled={readOnly}
+        type={isNumeric ? 'number' : 'text'}
+        value={value}
+        onChange={(e) => {
+          onChange(e);
+        }}
+      />
+    </Col>
+  </Form.Group>
+);
 
-  const handleButtonClick = () => {
-    setTimeout(() => { setTyping(true) }, 1000);
-  };
-
-  return (
-    <Form.Group as={Row} className="mt-3">
-      <Form.Label column sm={3}>{label}</Form.Label>
-      <Col sm={9}>
-        <Form.Control
-          disabled={readOnly}
-          type={isNumeric ? 'number' : 'text'}
-          value={value}
-          onChange={(e) => {
-            onChange(e);
-          }}
-        />
-      </Col>
-    </Form.Group>
-  );
+VesselProperty.propTypes = {
+  label: PropTypes.string.isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  onChange: PropTypes.func.isRequired,
+  readOnly: PropTypes.bool.isRequired,
+  isNumeric: PropTypes.bool,
+  optional: PropTypes.bool
 };
 
-// VesselProperty.propTypes = {
-//   label: PropTypes.string.isRequired,
-//   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-//   onChange: PropTypes.func.isRequired,
-//   readOnly: PropTypes.bool.isRequired,
-//   isNumeric: PropTypes.bool,
-//   optional: PropTypes.bool
-// };
-
 export default observer(VesselProperty);
diff --git a/app/packs/src/apps/mydb/elements/list/vessel/VesselEntry.js b/app/packs/src/apps/mydb/elements/list/vessel/VesselEntry.js
index 786e368da4..49405a6b50 100644
--- a/app/packs/src/apps/mydb/elements/list/vessel/VesselEntry.js
+++ b/app/packs/src/apps/mydb/elements/list/vessel/VesselEntry.js
@@ -1,3 +1,6 @@
+/* eslint-disable no-use-before-define */
+/* eslint-disable jsx-a11y/no-static-element-interactions */
+/* eslint-disable jsx-a11y/click-events-have-key-events */
 import React, { useState } from 'react';
 import UIStore from 'src/stores/alt/stores/UIStore';
 import VesselItemEntry from 'src/apps/mydb/elements/list/vessel/VesselItemEntry';
@@ -7,71 +10,55 @@ import { elementShowOrNew } from 'src/utilities/routesUtils';
 import Aviator from 'aviator';
 import ChevronIcon from 'src/components/common/ChevronIcon';
 
-const VesselEntry = ({ vesselItems }) => {
+function VesselEntry({ vesselItems }) {
   const [detailedInformation, setDetailedInformation] = useState(false);
   const [showEntries, setShowEntries] = useState(true);
 
   const getBorderStyle = () =>
-    showEntries
+    (showEntries
       ? 'list-container title-panel p-3'
-      : 'list-container title-panel p-3 cell-line-group-bottom-border';
-
-  const renderItemEntries = () =>
-    showEntries
-      ? vesselItems.map((vesselItem) => (
-          <VesselItemEntry key={vesselItem.id} vesselItem={vesselItem} />
-        ))
-      : [];
-  
-      const findThumbnailAttachment = (container) => {
-        if (!container || !container.children) return null;
-    
-        for (const child of container.children) {
-          if (child.attachments?.length) {
-            const thumbnail = child.attachments.find((attachment) => attachment.preview);
-            console.log('thumbnail', thumbnail);
-            if (thumbnail) return thumbnail;
-          }
-          const nestedThumbnail = findThumbnailAttachment(child);
-          if (nestedThumbnail) return nestedThumbnail;
-        }
-    
-        return null;
-      };
-  
-
-   const renderNameHeader = (firstVesselItem) => {
+      : 'list-container title-panel p-3 cell-line-group-bottom-border');
+
+  const renderItemEntries = () => (showEntries
+    ? vesselItems.map((vesselItem) => (
+      <VesselItemEntry key={vesselItem.id} vesselItem={vesselItem} />
+    ))
+    : []);
+
+  const findThumbnailAttachment = (container) => {
+    if (!container || !container.children) return null;
+
+    for (const child of container.children) {
+      if (child.attachments?.length) {
+        const thumbnail = child.attachments.find((attachment) => attachment.preview);
+        if (thumbnail) return thumbnail;
+      }
+      const nestedThumbnail = findThumbnailAttachment(child);
+      if (nestedThumbnail) return nestedThumbnail;
+    }
+
+    return null;
+  };
+
+  const renderNameHeader = (firstVesselItem) => {
     const thumbnail = findThumbnailAttachment(firstVesselItem.container);
     const imgSrc = thumbnail ? thumbnail.preview : null;
 
-     console.log(imgSrc);
-     
     return (
       <div className="d-flex gap-2 align-items-center">
         {imgSrc ? (
           <img
             src={imgSrc}
             alt={firstVesselItem.vesselName || 'Vessel'}
-            className="vessel-header-image"
+            className="vessel-header-image me-2 border rounded"
             style={{
               width: '100px',
               height: '100px',
               objectFit: 'cover',
-              marginRight: '10px',
-              borderRadius: '5px',
             }}
           />
         ) : (
-          <div
-            style={{
-              width: '100px',
-              height: '100px',
-              //backgroundColor: '#ddd',
-              marginRight: '10px',
-              borderRadius: '5px',
-              }}
-              className="bg-gray-2"
-          />
+          <div className="me-2" />
         )}
 
         <div className="flex-grow-1 fs-5">
@@ -86,18 +73,18 @@ const VesselEntry = ({ vesselItems }) => {
       </div>
     );
   };
-  
 
   const renderDetailedInfos = (firstVesselItem) => {
     if (!detailedInformation) return null;
 
     return (
       <div className="mt-2">
-        {renderProperty('Name', firstVesselItem.vesselName)}
-        {renderProperty('Vessel type', firstVesselItem.vesselType)}
-        {renderProperty('Material type', firstVesselItem.materialType)}
-        {renderProperty('Volume amount', firstVesselItem.volumeAmount)}
-        {renderProperty('Volume unit', firstVesselItem.volumeUnit)}
+        {renderProperty('Name', firstVesselItem.vessel_template.name)}
+        {renderProperty('Details', firstVesselItem.vessel_template.details)}
+        {renderProperty('Vessel type', firstVesselItem.vessel_template.vessel_type)}
+        {renderProperty('Material type', firstVesselItem.vessel_template.material_type)}
+        {renderProperty('Volume amount', firstVesselItem.vessel_template.volume_amount)}
+        {renderProperty('Volume unit', firstVesselItem.vessel_template.volume_unit)}
       </div>
     );
   };
@@ -106,11 +93,11 @@ const VesselEntry = ({ vesselItems }) => {
     <OverlayTrigger
       key="detailedInfoButton"
       placement="top"
-      overlay={
+      overlay={(
         <Tooltip id="detailed-info-button">
           Show detailed information about the material
         </Tooltip>
-      }
+      )}
     >
       <Button
         variant="info"
@@ -130,18 +117,17 @@ const VesselEntry = ({ vesselItems }) => {
     const { currentCollection, isSync } = UIStore.getState();
 
     if (currentCollection.label === 'All') return null;
-    if (currentCollection.is_sync_to_me && currentCollection.permission_level === 0)
-      return null;
+    if (currentCollection.is_sync_to_me && currentCollection.permission_level === 0) return null;
 
     return (
       <OverlayTrigger
         key="subSampleButton"
         placement="top"
-        overlay={
+        overlay={(
           <Tooltip id="detailed-info-button">
             Create sample of vessel template
           </Tooltip>
-        }
+        )}
       >
         <Button
           size="sm"
@@ -196,7 +182,7 @@ const VesselEntry = ({ vesselItems }) => {
       {renderItemEntries()}
     </div>
   );
-};
+}
 
 VesselEntry.propTypes = {
   vesselItems: PropTypes.arrayOf(
diff --git a/app/packs/src/stores/mobx/VesselDetailsStore.jsx b/app/packs/src/stores/mobx/VesselDetailsStore.jsx
index 8dace1eea5..d8cc30ac5c 100644
--- a/app/packs/src/stores/mobx/VesselDetailsStore.jsx
+++ b/app/packs/src/stores/mobx/VesselDetailsStore.jsx
@@ -56,38 +56,6 @@ export const VesselDetailsStore = types
       container.children = container.children || [];
       return container;
     },
-    initializeContainer(vesselId) {
-      const vessel = self.vessels.get(vesselId);
-      if (!vessel) {
-        console.error(`Vessel not found in store for id: ${vesselId}`);
-        return;
-      }
-      if (!vessel.container) {
-        vessel.container = { children: [] };
-      } else if (!Array.isArray(vessel.container.children)) {
-        vessel.container.children = [];
-      }
-    },
-    addContainerToVessel(vesselId) {
-      console.log("Adding container to vessel:", vesselId);
-      const vessel = self.vessels.get(vesselId);
-      if (!vessel) {
-        console.error("Vessel not found");
-        return;
-      }
-      const newContainer = self.addEmptyContainer(vesselId);
-      vessel.container.children.push(newContainer);
-      vessel.markChanged(true);
-    },
-    updateVesselContainer(vesselId, updatedContainer) {
-      const vessel = self.vessels.get(vesselId);
-      if (!vessel) {
-        console.error("Vessel not found");
-        return;
-      }
-      vessel.container = updatedContainer; 
-      vessel.markChanged(true);
-    },
     changeVesselName(id, newName) {
       self.vessels.get(id).changed = true;
       self.vessels.get(id).vesselName = newName;
@@ -177,7 +145,6 @@ export const VesselDetailsStore = types
       if (item === undefined) {
         throw new Error(`No vessel with id found: ${id}`);
       }
-      //name vs vesselName to be verified
       item.vesselName = properties.name;
       item.details = properties.details || '';
       item.materialDetails = properties.material_details || '';
@@ -193,14 +160,4 @@ export const VesselDetailsStore = types
     getVessel(id) {
       return self.vessels.get(id);
     },
-    checkInputValidity(id) {
-      const result = [];
-      const item = self.vessels.get(id);
-      if (item.name.trim() === '') { result.push('name'); }
-      // if (item.source.trim() === '') { result.push('source'); }
-      if (item.unit.trim() === '') { result.push('unit'); }
-      if (!item.isAmountValid()) { result.push('amount'); }
-      // if (!Number.isInteger(item.passage) || item.passage === 0) { result.push('passage'); }
-      return result;
-    }
   }));