diff --git a/react-app/app/items/[id]/page.js b/react-app/app/items/[id]/page.js
index 255665f..dd22907 100644
--- a/react-app/app/items/[id]/page.js
+++ b/react-app/app/items/[id]/page.js
@@ -16,6 +16,7 @@ export default function Page({ params }) {
   // const [kisten, setKisten] = useState([]);
   const [showKisteOverlay, setShowKisteOverlay] = useState(false);
   const [loading, setLoading] = useState(true);
+  const [editMode, setEditMode] = useState(false);
 
   async function loadData() {
     setLoading(true);
@@ -60,12 +61,75 @@ export default function Page({ params }) {
         </ul>
       </nav>
       <div style={{ textAlign: 'center' }}>
-        <h1
-          style={{ fontSize: '3.125em', color: 'red', marginBottom: '0.25em' }}
-        >
-          {itemJoined.name}
-        </h1>
-        <p>{itemJoined.description}</p>
+        <section style={{ textAlign: 'center' }}>
+          {editMode === false ? (
+            <div>
+              <h1 style={{ fontSize: '3.125em', color: 'red' }}>
+                {itemJoined.name}
+              </h1>
+              <h2 style={{ color: 'grey', marginBottom: '1em' }}>
+                {itemJoined.description}
+              </h2>
+            </div>
+          ) : (
+            <div>
+              <input
+                style={{
+                  padding: '0.625em 1.25em',
+                  marginBottom: '1.25em',
+                }}
+                type='text'
+                value={itemJoined.name}
+                onChange={(e) => {
+                  setItemJoined({ ...itemJoined, name: e.target.value });
+                }}
+              />
+              <input
+                style={{
+                  padding: '0.625em 1.25em',
+                  marginBottom: '1.25em',
+                }}
+                type='text'
+                value={itemJoined.description}
+                onChange={(e) => {
+                  setItemJoined({ ...itemJoined, description: e.target.value });
+                }}
+              />
+            </div>
+          )}
+          {/* Edit Mode Button */}
+          <button
+            style={{
+              color: 'black',
+              padding: '0.625em 1.25em',
+              marginBottom: '1.25em',
+            }}
+            onClick={async () => {
+              if (editMode === false) {
+                setEditMode(true);
+              }
+              if (editMode === true) {
+                setEditMode(false);
+                // Save changes
+                await fetch(apiURL + '/items/' + itemJoined.id, {
+                  method: 'PUT',
+                  headers: {
+                    'Content-Type': 'application/json',
+                  },
+                  body: JSON.stringify(itemJoined),
+                }).then((res) => {
+                  if (res.status !== 200) {
+                    alert('Error updating item.');
+                    return;
+                  }
+                  loadData();
+                });
+              }
+            }}
+          >
+            {editMode === false ? 'Edit' : 'Save'}
+          </button>
+        </section>
         <h1
           style={{
             fontSize: '1.875em',
diff --git a/react-app/app/kisten/[id]/page.js b/react-app/app/kisten/[id]/page.js
index 0fbf31b..d268744 100644
--- a/react-app/app/kisten/[id]/page.js
+++ b/react-app/app/kisten/[id]/page.js
@@ -15,6 +15,7 @@ export default function Page({ params }) {
   const [kisteWithItems, setKisteWithItems] = useState(null);
   const [showProductOverlay, setShowProductOverlay] = useState(false);
   const [loading, setLoading] = useState(true);
+  const [editMode, setEditMode] = useState(false);
 
   async function loadData() {
     setLoading(true);
@@ -62,10 +63,85 @@ export default function Page({ params }) {
         </nav>
       </div>
       <div style={{ textAlign: 'center' }}>
-        <h1 style={{ fontSize: '1.75em' }}>{kisteWithItems.name}</h1>
+        <section style={{ textAlign: 'center' }}>
+          {editMode === false ? (
+            <div>
+              <h1 style={{ fontSize: '1.75em' }}>{kisteWithItems.name}</h1>
+              <h2 style={{ color: 'grey', marginBottom: '1em' }}>
+                {kisteWithItems.location}
+              </h2>
+            </div>
+          ) : (
+            <div>
+              <input
+                style={{
+                  padding: '0.625em 1.25em',
+                  marginBottom: '1.25em',
+                }}
+                type='text'
+                value={kisteWithItems.name}
+                onChange={(e) => {
+                  setKisteWithItems({
+                    ...kisteWithItems,
+                    name: e.target.value,
+                  });
+                }}
+              />
+              <input
+                style={{
+                  padding: '0.625em 1.25em',
+                  marginBottom: '1.25em',
+                }}
+                type='text'
+                value={kisteWithItems.location}
+                onChange={(e) => {
+                  setKisteWithItems({
+                    ...kisteWithItems,
+                    location: e.target.value,
+                  });
+                }}
+              />
+            </div>
+          )}
+        </section>
+        <button
+          style={{
+            padding: '0.625em 1.25em',
+            marginBottom: '1.25em',
+          }}
+          onClick={async () => {
+            if (editMode === false) {
+              setEditMode(true);
+            }
+            if (editMode === true) {
+              setEditMode(false);
+              // Save changes
+              await fetch(apiURL + '/chests/' + kisteWithItems.id, {
+                method: 'PUT',
+                headers: {
+                  'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                  name: kisteWithItems.name,
+                  location: kisteWithItems.location,
+                }),
+              }).then((res) => {
+                if (res.status !== 200) {
+                  alert('Error updating chest');
+                  return;
+                }
+                loadData();
+              });
+            }
+          }}
+        >
+          {editMode === false ? 'Edit' : 'Save'}
+        </button>
+
+        {/* <h1 style={{ fontSize: '1.75em' }}>{kisteWithItems.name}</h1>
         <h2 style={{ color: 'grey', marginBottom: '1em' }}>
           {kisteWithItems.location}
-        </h2>
+        </h2> */}
 
         <h1
           style={{