diff --git a/images/draggableBulletUI.png b/images/draggableBulletUI.png
new file mode 100644
index 0000000..6fec78f
Binary files /dev/null and b/images/draggableBulletUI.png differ
diff --git a/images/leafBulletPoint.png b/images/leafBulletPoint.png
deleted file mode 100644
index f034283..0000000
Binary files a/images/leafBulletPoint.png and /dev/null differ
diff --git a/popupWindow/popup.css b/popupWindow/popup.css
index 746e392..a03db50 100644
--- a/popupWindow/popup.css
+++ b/popupWindow/popup.css
@@ -98,6 +98,7 @@ h4 {
 /* Input and Button Styling */
 input[type="text"], input[type="text"]:hover {
     border: none;
+    color: #F28705;
 }
 
 button {
@@ -188,12 +189,15 @@ ul div {
 }
 
 li {
-    cursor: grab;
+    cursor: move;
     display: flex;
     justify-content:space-between;
     flex-direction: row;
     gap: 5px;
     align-items: center;
+    /* background-color: rgba(242, 160, 7, 0.5); */
+    /* box-sizing: border-box; */
+    border-radius: 10px;
 }
 
 .notDrag {
@@ -205,16 +209,17 @@ span {
     color:#F28705;
     width: 75vw;
     word-wrap:break-word;
+    cursor: text;
 }
 
 #bulletPoint {
     width: 25px;
     height: 25px;
-    background-image: url('/images/leafBulletPoint.png');
+    background-image: url('/images/draggableBulletUI.png');
     background-size: contain;
     background-repeat: no-repeat;
     border-bottom: none !important;
-    margin-right: 15px;
+    /* margin-right: 15px; */
 }
 
 /* for countdown timer */
diff --git a/popupWindow/popup.js b/popupWindow/popup.js
index e79ed67..7048004 100644
--- a/popupWindow/popup.js
+++ b/popupWindow/popup.js
@@ -219,6 +219,7 @@ function addTaskToDOM(section, task) {
     const taskSpan = document.createElement('span');
     taskSpan.id = task.id;
     taskSpan.textContent = task.content;
+    taskSpan.contentEditable = true;
     taskSpan.addEventListener('dragstart', (e) => {
         e.preventDefault(); // make text not draggable (bug fix)
     });
@@ -234,9 +235,11 @@ function addTaskToDOM(section, task) {
     const prettyBulletPoint = document.createElement('div');
     prettyBulletPoint.id = 'bulletPoint';
 
+    listItem.appendChild(document.createElement('div'))
     listItem.appendChild(prettyBulletPoint);
     listItem.appendChild(taskSpan);
     listItem.appendChild(deleteButton);
+    listItem.appendChild(document.createElement('div'))
     taskList.parentNode.insertBefore(listItem, taskList.nextSibling);
 }
 
@@ -244,13 +247,20 @@ function editTask(section, taskSpan) {
     const taskList = getTasksFromStorage();
     const task = taskList[section].find(t => t.id === taskSpan.id);
     if (task !== undefined){
-        if (!taskSpan.isContentEditable) {
-            taskSpan.contentEditable = true;
-            taskSpan.focus();
-        } else {
-            task.content = taskSpan.textContent;
-            saveTasksToStorage(taskList);
-        }
+        taskSpan.focus();
+        // Add blur event to save when done editing
+        taskSpan.addEventListener('blur', () => {
+            if (taskSpan.textContent === "") {
+                deleteTask(section, taskSpan.id);
+            } else {
+                task.content = taskSpan.textContent;
+                taskList[section] = taskList[section].map(t =>
+                    t.id === task.id ? task : t
+                );
+                saveTasksToStorage(taskList);
+            }
+        });
+        
     }
 }
 
@@ -262,9 +272,12 @@ function deleteTask(section, taskId) {
 
 function getTasksFromStorage() {
     const tasks = localStorage.getItem('tasks');
-    if (!tasks || tasks === 'undefined') {
+    if (!tasks || tasks === 'undefined' || tasks === "{\"NotDone\":[],\"Doing\":[],\"Done\":[]}") {
         return {
-            'NotDone': [],
+            'NotDone': [{
+                id: "task0",
+                content: "Your first task! Drag/drop, edit, or delete this."
+            }],
             'Doing': [],
             'Done': []
         };
@@ -318,7 +331,12 @@ function makeTaskDraggable(sortableList) {
             }
             afterElement.style.borderBottom = '5px solid #8C5C4A';
             // Insert after the hovered element by using insertBefore and nextSibling
-            sortableList.insertBefore(draggedItem, afterElement.nextSibling);
+            try {
+                sortableList.insertBefore(draggedItem, afterElement.nextSibling);
+            } catch (error) {
+                // functionality still works, because it throws the error when it's in a temporarily invliad state (when the user is still hovering)
+            }
+                
         }
     });
 
@@ -328,7 +346,7 @@ function makeTaskDraggable(sortableList) {
         ),];
         return draggableElements.reduce((closest, child) => {
             const box = child.getBoundingClientRect();
-            const offset = y - box.top - box.height / 2;
+            const offset = y - box.top - box.height;
             if (offset < 0 && offset > closest.offset) {
                 return { offset: offset, element: child };
             } else {