diff --git a/src/my-time.css b/src/my-time.css
index e2c56eb..492d7b2 100644
--- a/src/my-time.css
+++ b/src/my-time.css
@@ -1,5 +1,6 @@
-html, body { height: 100vh; overflow: auto; }
+html, body { height: 100vh; overflow: hidden; }
 body { padding: 20px; display: flex; flex-direction: column; }
+.page-scroll { flex: 1; min-height: 0; overflow-y: auto; }
 
 .page-header { display: flex; align-items: baseline; justify-content: space-between; flex-wrap: wrap; gap: 8px; margin-bottom: 20px; flex-shrink: 0; }
 .page-header h1 { margin: 0; font-weight: 600; }
@@ -96,8 +97,11 @@ body { padding: 20px; display: flex; flex-direction: column; }
 .quicklog input[type="date"] { width: 140px; }
 .quicklog button { padding: 5px 12px; font-size: 13px; }
 
-.delete-btn { background-color: var(--error-border) !important; padding: 4px 10px; font-size: 12px; }
-.delete-btn:hover { opacity: 0.85; }
+/* week navigation header */
+.section-header { display: flex; align-items: center; justify-content: space-between; margin-bottom: 12px; }
+.section-header .section-title { margin: 0; }
+.week-nav { display: flex; gap: 4px; }
+.week-nav-btn { padding: 2px 10px; font-size: 16px; line-height: 1; }
 
 .empty { padding: 32px; text-align: center; color: var(--text-secondary); }
 .loading { padding: 40px; text-align: center; color: var(--text-secondary); }
diff --git a/src/my-time.html b/src/my-time.html
index 20350fe..3b2bbca 100644
--- a/src/my-time.html
+++ b/src/my-time.html
@@ -30,8 +30,15 @@ <h1 id="greeting">My Time</h1>
       <button onclick="applyFilters()">Apply</button>
       <button class="secondary" onclick="clearFilters()">Clear</button>
     </div>
+    <div class="filters-add">
+      <button class="add-entry-btn" onclick="openAddEntry()" title="Add a new time entry">
+        <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"></line><line x1="5" y1="12" x2="19" y2="12"></line></svg>
+        Add Entry
+      </button>
+    </div>
   </div>
 
+  <div class="page-scroll">
   <div id="loading" class="loading">Loading…</div>
 
   <div id="content" style="display:none;">
@@ -57,7 +64,13 @@ <h3>Untracked This Week</h3>
     </div>
 
     <div class="section">
-      <div class="section-title">This Week</div>
+      <div class="section-header">
+        <div class="section-title" id="weekTitle">This Week</div>
+        <div class="week-nav">
+          <button class="secondary week-nav-btn" onclick="browseWeek(-1)" title="Previous week">&#8249;</button>
+          <button class="secondary week-nav-btn" id="weekNextBtn" onclick="browseWeek(1)" title="Next week" disabled>&#8250;</button>
+        </div>
+      </div>
       <div class="week-strip" id="weekStrip"></div>
     </div>
 
@@ -94,14 +107,22 @@ <h3>Untracked This Week</h3>
       </div>
     </div>
   </div>
+  </div><!-- /.page-scroll -->
 
   <script>
     function applyDevOpsTheme() {
       function applyIfExplicit(t) {
         if (!t) return false;
-        // A non-empty theme that isn't a dark variant (e.g. "Default") means light.
-        document.documentElement.classList.toggle('dark', String(t).toLowerCase().indexOf('dark') !== -1);
-        return true;
+        var theme = String(t).toLowerCase();
+        if (theme.indexOf('dark') !== -1) {
+          document.documentElement.classList.add('dark');
+          return true;
+        }
+        if (theme === 'default' || theme === 'light') {
+          document.documentElement.classList.remove('dark');
+          return true;
+        }
+        return false;
       }
       var t = '';
       try { if (typeof VSS.getPageContext === 'function') t = (VSS.getPageContext().globalization.theme || '').toLowerCase(); } catch(e) {}
@@ -129,12 +150,19 @@ <h3>Untracked This Week</h3>
 
     console.log("[MyTime] Script started");
     var TC = window.TimeCore;
+    var escapeHtml = TC.escapeHtml;
+    var EDIT_ICON  = TC.EDIT_ICON;
+    var DELETE_ICON = TC.DELETE_ICON;
     var currentUser = null;
     var witClient = null;
+    var collectionUri = "";
+    var weekOffset = 0;
     var allMyEntries = [];      // user's entries across the loaded window (live KPI math)
     var filteredEntries = [];   // allMyEntries within the selected From/To range
     var assignedItems = [];     // active work items assigned to @Me
     var closedEntryItemIds = {}; // { idString: true } — entry-only items whose CURRENT state is closed
+    var editingEntryId = null;
+    var editingEntryOriginalDate = null;
 
     var EXCLUDED_STATES = ["Closed", "Done", "Removed", "Resolved", "Completed"];
 
@@ -154,6 +182,7 @@ <h3>Untracked This Week</h3>
 
           var ctx = VSS.getWebContext();
           currentUser = ctx.user;
+          collectionUri = ((ctx.collection || {}).uri || "").replace(/\/$/, "");
           window.__projectName = ctx.project && ctx.project.name;
 
           var first = (currentUser.name || "").split(/[ ,]/)[0] || currentUser.name;
@@ -362,9 +391,41 @@ <h3>Untracked This Week</h3>
       return list.reduce(function(s, e){ return s + (e.hours || 0); }, 0);
     }
 
+    function getViewWeek() {
+      if (weekOffset === 0) return TC.weekDates();
+      var ref = new Date();
+      ref.setDate(ref.getDate() + weekOffset * 7);
+      return TC.weekDates(ref);
+    }
+
+    function browseWeek(delta) {
+      weekOffset += delta;
+      if (weekOffset > 0) weekOffset = 0;
+      renderWeekSection();
+    }
+
+    function renderWeekSection() {
+      var week = getViewWeek();
+      var today = TC.todayISO();
+      renderWeekStrip(week, today);
+      var title;
+      if (weekOffset === 0) {
+        title = 'This Week';
+      } else if (weekOffset === -1) {
+        title = 'Last Week';
+      } else {
+        var d0 = new Date(week[0] + 'T00:00:00');
+        var d6 = new Date(week[6] + 'T00:00:00');
+        title = 'Week of ' + d0.toLocaleDateString(undefined, { month: 'short', day: 'numeric' }) +
+                ' – ' + d6.toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
+      }
+      document.getElementById('weekTitle').textContent = title;
+      document.getElementById('weekNextBtn').disabled = weekOffset >= 0;
+    }
+
     function render() {
       var today = TC.todayISO();
-      var week = TC.weekDates();          // Mon..Sun ISO strings
+      var week = TC.weekDates();          // current week for KPI cards + work table
       var weekSet = {};
       week.forEach(function(d){ weekSet[d] = true; });
       var monthPrefix = today.slice(0, 7); // YYYY-MM
@@ -377,7 +438,7 @@ <h3>Untracked This Week</h3>
       setCard("cardWeek", weekHours);
       setCard("cardMonth", monthHours);
 
-      renderWeekStrip(week, today);
+      renderWeekSection();
       var untracked = renderWorkTable(week, weekSet);
       document.getElementById("cardUntracked").textContent = untracked;
       document.getElementById("cardUntrackedWrap").classList.toggle("is-warn", untracked > 0);
@@ -487,10 +548,14 @@ <h3>Untracked This Week</h3>
         var parent = r.parentTitle
           ? escapeHtml(r.parentTitle) + (r.parentType ? ' <span class="muted">(' + escapeHtml(r.parentType) + ')</span>' : '')
           : '<span class="muted">—</span>';
+        var wiUrl = getWorkItemUrl(r.id, window.__projectName);
+        var wiIdLabel = wiUrl
+          ? '<a href="' + wiUrl + '" target="_blank" rel="noopener noreferrer" class="wi-id">#' + r.id + '</a>'
+          : '<span class="wi-id">#' + r.id + '</span>';
         return '<tr>' +
           '<td>' + typeBadge +
             '<span class="wi-title">' + escapeHtml(r.title || "(untitled)") + '</span> ' +
-            '<span class="wi-id">#' + r.id + '</span>' + nudge + '</td>' +
+            wiIdLabel + nudge + '</td>' +
           '<td>' + parent + '</td>' +
           '<td>' + (r.weekHours ? '<strong>' + r.weekHours.toFixed(1) + 'h</strong>' : '<span class="muted">—</span>') + '</td>' +
           '<td>' + (r.recentHours ? r.recentHours.toFixed(1) + 'h' : '<span class="muted">—</span>') + '</td>' +
@@ -521,12 +586,19 @@ <h3>Untracked This Week</h3>
       }
       empty.style.display = "none";
       body.innerHTML = sorted.map(function(e) {
+        var wiUrl = getWorkItemUrl(e.workItemId, e.teamProject);
+        var wiIdLabel = wiUrl
+          ? '<a href="' + wiUrl + '" target="_blank" rel="noopener noreferrer" class="wi-id">#' + e.workItemId + '</a>'
+          : '<span class="wi-id">#' + e.workItemId + '</span>';
         return '<tr>' +
           '<td>' + e.date + '</td>' +
-          '<td><span class="wi-title">' + escapeHtml(e.workItemTitle || "") + '</span> <span class="wi-id">#' + e.workItemId + '</span></td>' +
+          '<td><span class="wi-title">' + escapeHtml(e.workItemTitle || "") + '</span> ' + wiIdLabel + '</td>' +
           '<td>' + (e.description ? escapeHtml(e.description) : '<span class="muted">—</span>') + '</td>' +
           '<td><strong>' + e.hours + 'h</strong></td>' +
-          '<td><button class="delete-btn" onclick="deleteEntry(\'' + e.id + '\',\'' + e.date + '\')">Delete</button></td>' +
+          '<td class="actions-cell">' +
+            '<button class="icon-btn edit-btn" title="Edit" onclick="editEntry(\'' + e.id + '\')">' + EDIT_ICON + '</button>' +
+            '<button class="icon-btn delete-btn" title="Delete" onclick="deleteEntry(\'' + e.id + '\',\'' + e.date + '\')">' + DELETE_ICON + '</button>' +
+          '</td>' +
         '</tr>';
       }).join("");
     }
@@ -556,6 +628,48 @@ <h3>Untracked This Week</h3>
       });
     }
 
+    function getWorkItemUrl(wiId, teamProject) {
+      var base = collectionUri.replace(/\/$/, "");
+      var proj = teamProject || window.__projectName || "";
+      if (!base || !proj) return null;
+      return base + "/" + encodeURIComponent(proj) + "/_workitems/edit/" + wiId;
+    }
+
+    function editEntry(entryId) {
+      var entry = allMyEntries.find(function(e) { return e.id === entryId; });
+      if (!entry) { showMessage("Entry not found", "error"); return; }
+      editingEntryId = entryId;
+      editingEntryOriginalDate = entry.date;
+      document.getElementById("editHours").value = entry.hours;
+      document.getElementById("editDate").value = entry.date;
+      document.getElementById("editDescription").value = entry.description || "";
+      document.getElementById("editModal").style.display = "flex";
+    }
+
+    function closeEditModal() {
+      document.getElementById("editModal").style.display = "none";
+      editingEntryId = null;
+      editingEntryOriginalDate = null;
+    }
+
+    function saveEditEntry() {
+      var hours = parseFloat(document.getElementById("editHours").value);
+      var date = document.getElementById("editDate").value;
+      var description = document.getElementById("editDescription").value;
+      if (!hours || hours <= 0 || hours > 24) { showMessage("Enter valid hours (0.25 – 24)", "error"); return; }
+      if (!date) { showMessage("Pick a date", "error"); return; }
+      document.getElementById("editSaveBtn").disabled = true;
+      TC.updateEntry(window.dataService, editingEntryId, editingEntryOriginalDate, { hours: hours, date: date, description: description })
+        .then(function() {
+          showMessage("Entry updated", "success");
+          closeEditModal();
+          return reloadAll();
+        }, function() {
+          showMessage("Failed to update entry", "error");
+          document.getElementById("editSaveBtn").disabled = false;
+        });
+    }
+
     function deleteEntry(entryId, entryDate) {
       if (!confirm("Delete this time entry?")) return;
       TC.deleteEntryById(window.dataService, entryId, entryDate).then(function() {
@@ -567,21 +681,60 @@ <h3>Untracked This Week</h3>
       });
     }
 
+    function openAddEntry() {
+      var seen = {}, recent = [];
+      // Items from recent entries first (most recently logged date first),
+      // then active assigned items not yet in the list.
+      allMyEntries.slice().sort(function(a, b) {
+        return b.date > a.date ? -1 : b.date < a.date ? 1 : 0;
+      }).forEach(function(e) {
+        var k = String(e.workItemId);
+        if (!seen[k]) { seen[k] = true; recent.push({ id: e.workItemId, title: e.workItemTitle || '(untitled)', type: null }); }
+      });
+      assignedItems.forEach(function(wi) {
+        var k = String(wi.id);
+        if (!seen[k]) { seen[k] = true; recent.push({ id: wi.id, title: wi.title, type: wi.type }); }
+      });
+      TC.openAddEntryModal({
+        dataService: window.dataService,
+        witClientGetter: getWitClient,
+        currentUser: currentUser,
+        projectName: window.__projectName,
+        recentItems: recent.slice(0, 20),
+        onSaved: function() { showMessage('Time logged!', 'success'); reloadAll(); }
+      });
+    }
+
     function showMessage(text, type) {
       var msg = document.getElementById("message");
       msg.textContent = text;
       msg.className = "message " + type;
       msg.style.display = "block";
-      window.scrollTo({ top: 0, behavior: "smooth" });
       setTimeout(function(){ msg.style.display = "none"; }, 3500);
     }
 
-    function escapeHtml(text) {
-      if (text == null) return "";
-      var div = document.createElement("div");
-      div.textContent = text;
-      return div.innerHTML;
-    }
   </script>
+
+  <div id="editModal" class="edit-modal-backdrop" style="display:none;">
+    <div class="edit-modal-content">
+      <h3>Edit Time Entry</h3>
+      <div class="filter-group">
+        <label for="editHours">Hours Spent</label>
+        <input type="number" id="editHours" min="0.25" max="24" step="0.25" onkeydown="return event.key !== 'e' && event.key !== 'E' && event.key !== '+' && event.key !== '-'">
+      </div>
+      <div class="filter-group">
+        <label for="editDate">Date</label>
+        <input type="date" id="editDate">
+      </div>
+      <div class="filter-group">
+        <label for="editDescription">Description (optional, max 100 chars)</label>
+        <textarea id="editDescription" rows="3" maxlength="100" style="resize:vertical;"></textarea>
+      </div>
+      <div class="edit-modal-actions">
+        <button id="editSaveBtn" onclick="saveEditEntry()">Save</button>
+        <button class="secondary" onclick="closeEditModal()">Cancel</button>
+      </div>
+    </div>
+  </div>
 </body>
 </html>
diff --git a/src/notification-settings.html b/src/notification-settings.html
index 73efe21..28d4c9b 100644
--- a/src/notification-settings.html
+++ b/src/notification-settings.html
@@ -87,9 +87,16 @@ <h2>User Notification Configuration</h2>
     function applyDevOpsTheme() {
       function applyIfExplicit(t) {
         if (!t) return false;
-        // A non-empty theme that isn't a dark variant (e.g. "Default") means light.
-        document.documentElement.classList.toggle('dark', String(t).toLowerCase().indexOf('dark') !== -1);
-        return true;
+        var theme = String(t).toLowerCase();
+        if (theme.indexOf('dark') !== -1) {
+          document.documentElement.classList.add('dark');
+          return true;
+        }
+        if (theme === 'default' || theme === 'light') {
+          document.documentElement.classList.remove('dark');
+          return true;
+        }
+        return false;
       }
       var t = '';
       try { if (typeof VSS.getPageContext === 'function') t = (VSS.getPageContext().globalization.theme || '').toLowerCase(); } catch(e) {}
diff --git a/src/theme.css b/src/theme.css
index f39d98d..77bcaf0 100644
--- a/src/theme.css
+++ b/src/theme.css
@@ -241,3 +241,190 @@ tr:hover td {
 .status { font-size: 13px; }
 .status.success { color: var(--success-text); }
 .status.error   { color: var(--error-text); }
+
+/* ================================================================
+   Icon action buttons — shared across all pages
+   ================================================================ */
+.icon-btn {
+  background: transparent !important;
+  border: none;
+  padding: 0;
+  border-radius: 3px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  color: var(--text-secondary) !important;
+  width: 28px;
+  height: 28px;
+  cursor: pointer;
+}
+.icon-btn:hover { background: var(--bg-row-hover) !important; }
+.edit-btn:hover  { color: var(--accent) !important; }
+.delete-btn:hover { color: #d13438 !important; }
+.actions-cell { white-space: nowrap; padding: 8px 12px !important; }
+
+/* ================================================================
+   Edit entry modal — shared across all pages
+   ================================================================ */
+.edit-modal-backdrop {
+  position: fixed;
+  top: 0; left: 0;
+  width: 100%; height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 1000;
+  align-items: center;
+  justify-content: center;
+}
+.edit-modal-content {
+  background: var(--bg-card);
+  padding: 24px;
+  border-radius: 4px;
+  min-width: 300px;
+  max-width: 440px;
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3);
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+.edit-modal-content h3 { margin: 0; }
+.edit-modal-content label { font-weight: 600; color: var(--text-primary) !important; font-size: 13px; }
+.edit-modal-content input,
+.edit-modal-content textarea { width: 100%; box-sizing: border-box; }
+.edit-modal-actions { display: flex; gap: 8px; }
+
+/* Table links */
+td a { color: var(--accent); text-decoration: none; }
+td a:hover { text-decoration: underline; }
+
+/* ================================================================
+   Add-entry button (filter bar, far right)
+   ================================================================ */
+.filters-add { margin-left: auto; display: flex; align-items: flex-end; }
+
+.add-entry-btn {
+  display: inline-flex !important;
+  align-items: center;
+  gap: 6px;
+  background: transparent !important;
+  color: var(--text-secondary) !important;
+  border: 1px solid var(--border-input) !important;
+  padding: 5px 12px !important;
+  border-radius: 3px;
+  font-size: 13px;
+  white-space: nowrap;
+  cursor: pointer;
+}
+.add-entry-btn:hover {
+  color: var(--accent) !important;
+  border-color: var(--accent) !important;
+  background: var(--bg-accent-light) !important;
+}
+
+/* ================================================================
+   Add-entry modal: work item picker
+   ================================================================ */
+.tc-add-modal { max-width: 520px; width: 100%; }
+
+.tc-add-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+}
+.tc-add-header h3 { margin: 0; }
+
+.tc-modal-close {
+  background: transparent !important;
+  border: none;
+  color: var(--text-secondary) !important;
+  font-size: 18px;
+  line-height: 1;
+  padding: 2px 6px;
+  cursor: pointer;
+  border-radius: 3px;
+}
+.tc-modal-close:hover { background: var(--bg-row-hover) !important; color: var(--text-primary) !important; }
+
+.tc-search-input { width: 100%; box-sizing: border-box; }
+
+.tc-search-status {
+  font-size: 12px;
+  color: var(--text-secondary);
+  min-height: 18px;
+  margin: 4px 0;
+}
+
+.tc-item-list {
+  border: 1px solid var(--border);
+  border-radius: 2px;
+  max-height: 180px;
+  overflow-y: auto;
+}
+
+.tc-item-group {
+  padding: 5px 12px;
+  font-size: 11px;
+  font-weight: 600;
+  text-transform: uppercase;
+  color: var(--text-secondary);
+  background: var(--bg-header);
+  border-bottom: 1px solid var(--border);
+}
+
+.tc-item-row {
+  display: flex !important;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  text-align: left;
+  background: transparent !important;
+  color: var(--text-primary) !important;
+  border: none;
+  border-bottom: 1px solid var(--border);
+  border-radius: 0 !important;
+  padding: 8px 12px !important;
+  cursor: pointer;
+  font-size: 13px;
+}
+.tc-item-row:last-child { border-bottom: none; }
+.tc-item-row:hover { background: var(--bg-row-hover) !important; }
+
+.tc-item-type {
+  display: inline-block;
+  padding: 2px 7px;
+  border-radius: 10px;
+  font-size: 11px;
+  font-weight: 600;
+  background: var(--bg-accent-light);
+  color: var(--accent);
+  flex-shrink: 0;
+  white-space: nowrap;
+}
+
+.tc-item-title { flex: 1; min-width: 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+
+.tc-item-empty { padding: 20px 12px; color: var(--text-secondary); font-size: 13px; text-align: center; }
+
+/* Selected work item chip — a clickable button that reopens the search */
+.tc-selected-chip {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  text-align: left;
+  background: var(--bg-header) !important;
+  color: var(--text-primary) !important;
+  border: 1px solid var(--border) !important;
+  border-radius: 4px;
+  padding: 8px 12px !important;
+  margin-bottom: 4px;
+  font-size: 13px;
+  cursor: pointer;
+}
+.tc-selected-chip:hover {
+  border-color: var(--accent) !important;
+  background: var(--bg-accent-light) !important;
+}
+/* Pencil icon: faintly visible at rest, full opacity on hover */
+.tc-chip-pencil { margin-left: auto; flex-shrink: 0; opacity: 0.25; }
+.tc-selected-chip:hover .tc-chip-pencil { opacity: 0.8; }
diff --git a/src/time-core.js b/src/time-core.js
index 004ef88..3f68e7f 100644
--- a/src/time-core.js
+++ b/src/time-core.js
@@ -1,4 +1,4 @@
-/* ================================================================
+/* ================================================================
    time-core.js — shared storage + entry logic
 
    Loaded as a plain <script> (no build step), exposes window.TimeCore.
@@ -151,6 +151,43 @@
     });
   }
 
+  var EDIT_ICON = '<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path><path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path></svg>';
+  var DELETE_ICON = '<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><polyline points="3 6 5 6 21 6"></polyline><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2"></path></svg>';
+
+  function escapeHtml(text) {
+    if (text == null) return "";
+    var div = document.createElement("div");
+    div.textContent = text;
+    return div.innerHTML;
+  }
+
+  function updateEntry(dataService, entryId, originalDate, updates) {
+    var originalKey = getStorageKeyForDate(originalDate);
+    var newKey = getStorageKeyForDate(updates.date);
+    if (originalKey === newKey) {
+      return dataService.getValue(originalKey, { scopeType: "Default" }).then(function(data) {
+        var updated = (data || []).map(function(e) {
+          if (e.id !== entryId) return e;
+          return Object.assign({}, e, updates);
+        });
+        return dataService.setValue(originalKey, updated, { scopeType: "Default" });
+      });
+    }
+    return Promise.all([
+      dataService.getValue(originalKey, { scopeType: "Default" }),
+      dataService.getValue(newKey, { scopeType: "Default" })
+    ]).then(function(results) {
+      var oldEntries = results[0] || [];
+      var newEntries = results[1] || [];
+      var entryToMove = oldEntries.find(function(e) { return e.id === entryId; });
+      if (!entryToMove) throw new Error("Entry not found in original month");
+      var updatedEntry = Object.assign({}, entryToMove, updates);
+      return dataService.setValue(newKey, newEntries.concat([updatedEntry]), { scopeType: "Default" }).then(function() {
+        return dataService.setValue(originalKey, oldEntries.filter(function(e) { return e.id !== entryId; }), { scopeType: "Default" });
+      });
+    });
+  }
+
   // ---- Entry construction with parent/epic inheritance -------------
   // Mirrors processWorkItem() in time-entry.html. Resolves with the
   // built entry; the caller is responsible for persisting it.
@@ -250,6 +287,257 @@
     });
   }
 
+  // ---- Add / Edit entry modal (work item picker + time entry form) ---
+  // Single-screen design: the work item chip and the form fields are
+  // always visible together. Clicking the chip (or the search area)
+  // toggles the picker list open/closed.
+  //
+  // config: {
+  //   dataService     — ExtensionData service
+  //   witClientGetter — () => Promise<witClient>
+  //   currentUser     — { id, name, email }
+  //   projectName     — scopes the WIQL title search
+  //   recentItems     — [{ id, title, type }] shown before the user types
+  //   onSaved         — () called after a successful save
+  //   // Pre-fill for future edit use:
+  //   title           — modal heading (default "Log Time")
+  //   saveLabel       — save button label (default "Log Time")
+  //   initialItem     — { id, title, type } pre-selected work item
+  //   initialHours    — number
+  //   initialDate     — "YYYY-MM-DD"
+  //   initialDesc     — string
+  // }
+  function openAddEntryModal(config) {
+    var old = document.getElementById('tcAddModal');
+    if (old) old.remove();
+
+    var today = localISODate(new Date());
+    var backdrop = document.createElement('div');
+    backdrop.id = 'tcAddModal';
+    backdrop.className = 'edit-modal-backdrop';
+    backdrop.style.display = 'flex';
+
+    var PENCIL_ICON =
+      '<svg class="tc-chip-pencil" width="12" height="12" viewBox="0 0 24 24" fill="none"' +
+        ' stroke="currentColor" stroke-width="2.5">' +
+        '<path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path>' +
+        '<path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path>' +
+      '</svg>';
+
+    backdrop.innerHTML =
+      '<div class="edit-modal-content tc-add-modal">' +
+        '<div class="tc-add-header"><h3>' + escapeHtml(config.title || 'Log Time') + '</h3>' +
+          '<button class="tc-modal-close" id="tcAddClose" title="Close">&#x2715;</button></div>' +
+        // Work item area: chip (selected) XOR search (unselected)
+        '<button class="tc-selected-chip" id="tcSelectedChip" style="display:none"' +
+          ' title="Click to change work item">' +
+          '<span id="tcChipContent"></span>' +
+          PENCIL_ICON +
+        '</button>' +
+        '<div id="tcSearchWrap">' +
+          '<input type="text" id="tcSearchInput" class="tc-search-input"' +
+            ' placeholder="Search by title or work item #ID…" autocomplete="off">' +
+          '<div id="tcSearchStatus" class="tc-search-status"></div>' +
+          '<div id="tcItemList" class="tc-item-list"></div>' +
+        '</div>' +
+        // Form fields — always visible
+        '<div class="filter-group" style="margin-top:8px">' +
+          '<label for="tcHours">Hours Spent</label>' +
+          '<input type="number" id="tcHours" min="0.25" max="24" step="0.25" placeholder="e.g. 2.5"' +
+            ' onkeydown="return event.key!==\'e\'&&event.key!==\'E\'&&event.key!==\'+\'&&event.key!==\'-\'">' +
+        '</div>' +
+        '<div class="filter-group">' +
+          '<label for="tcDate">Date</label>' +
+          '<input type="date" id="tcDate" value="' + today + '">' +
+        '</div>' +
+        '<div class="filter-group">' +
+          '<label for="tcDesc">Description' +
+            ' <span style="font-weight:400;color:var(--text-secondary)">(optional, max 100 chars)</span></label>' +
+          '<textarea id="tcDesc" rows="2" maxlength="100"' +
+            ' style="resize:vertical;width:100%;box-sizing:border-box;"></textarea>' +
+        '</div>' +
+        '<div id="tcFormMsg" class="message" style="display:none;margin:0;padding:6px 10px;font-size:13px;"></div>' +
+        '<div class="edit-modal-actions">' +
+          '<button id="tcSaveBtn">' + escapeHtml(config.saveLabel || 'Log Time') + '</button>' +
+        '</div>' +
+      '</div>';
+
+    document.body.appendChild(backdrop);
+
+    var selectedItem = null;
+    var searchTimer  = null;
+
+    function close() { backdrop.remove(); document.removeEventListener('keydown', onEsc); }
+
+    // Show the search input + list, hide the chip
+    function openSearch() {
+      selectedItem = null;
+      document.getElementById('tcSelectedChip').style.display = 'none';
+      document.getElementById('tcSearchWrap').style.display = '';
+      document.getElementById('tcSearchInput').value = '';
+      document.getElementById('tcSearchStatus').textContent = '';
+      renderList(config.recentItems || [], 'Recently used');
+      setTimeout(function() { document.getElementById('tcSearchInput').focus(); }, 0);
+    }
+
+    // Hide search, show the selected-item chip
+    function selectItem(item) {
+      selectedItem = item;
+      document.getElementById('tcSearchWrap').style.display = 'none';
+      var chip = document.getElementById('tcSelectedChip');
+      chip.style.display = '';
+      document.getElementById('tcChipContent').innerHTML =
+        (item.type ? '<span class="tc-item-type">' + escapeHtml(item.type) + '</span> ' : '') +
+        '<span class="wi-id">#' + item.id + '</span> ' +
+        '<span class="wi-title">' + escapeHtml(item.title) + '</span>';
+      document.getElementById('tcFormMsg').style.display = 'none';
+      setTimeout(function() { document.getElementById('tcHours').focus(); }, 0);
+    }
+
+    function renderList(items, groupLabel) {
+      var list = document.getElementById('tcItemList');
+      if (!items || !items.length) {
+        list.innerHTML = '<div class="tc-item-empty">' +
+          escapeHtml(groupLabel || 'No items found') + '</div>';
+        return;
+      }
+      list.innerHTML =
+        (groupLabel ? '<div class="tc-item-group">' + escapeHtml(groupLabel) + '</div>' : '') +
+        items.map(function(item) {
+          return '<button class="tc-item-row">' +
+            (item.type ? '<span class="tc-item-type">' + escapeHtml(item.type) + '</span> ' : '') +
+            '<span class="wi-id">#' + item.id + '</span> ' +
+            '<span class="wi-title tc-item-title">' + escapeHtml(item.title || '(untitled)') + '</span>' +
+          '</button>';
+        }).join('');
+      var cached = items;
+      Array.prototype.forEach.call(list.querySelectorAll('.tc-item-row'), function(btn, i) {
+        btn.addEventListener('click', function() { selectItem(cached[i]); });
+      });
+    }
+
+    function doSearch(raw) {
+      var q = (raw || '').trim();
+      var statusEl = document.getElementById('tcSearchStatus');
+      if (!q) {
+        statusEl.textContent = '';
+        renderList(config.recentItems || [], 'Recently used');
+        return;
+      }
+      // Pure number → direct work item ID lookup
+      if (/^\d+$/.test(q)) {
+        statusEl.textContent = 'Looking up #' + q + '…';
+        config.witClientGetter().then(function(c) {
+          return c.getWorkItem(parseInt(q, 10), null, null, 0);
+        }).then(function(wi) {
+          statusEl.textContent = '';
+          renderList([{
+            id: wi.id,
+            title: wi.fields['System.Title'],
+            type: wi.fields['System.WorkItemType']
+          }], null);
+        }).catch(function() {
+          statusEl.textContent = '';
+          renderList([], 'No work item found for #' + q);
+        });
+        return;
+      }
+      if (q.length < 2) {
+        statusEl.textContent = 'Type at least 2 characters…';
+        renderList([], '');
+        return;
+      }
+      statusEl.textContent = 'Searching…';
+      config.witClientGetter().then(function(c) {
+        var safe = q.replace(/'/g, "''");
+        var proj = config.projectName || '';
+        var wiql = { query:
+          'SELECT [System.Id] FROM WorkItems WHERE [System.Title] CONTAINS \'' + safe + '\'' +
+          (proj ? ' AND [System.TeamProject] = \'' + proj.replace(/'/g, "''") + '\'' : '') +
+          ' AND [System.State] NOT IN (\'Closed\',\'Done\',\'Removed\',\'Resolved\',\'Completed\')' +
+          ' ORDER BY [System.ChangedDate] DESC'
+        };
+        return c.queryByWiql(wiql, proj ? { project: proj } : null, false, 20)
+          .then(function(res) {
+            var ids = (res.workItems || []).map(function(w) { return w.id; }).slice(0, 20);
+            if (!ids.length) return [];
+            return c.getWorkItems(ids, proj || null,
+              ['System.Id', 'System.Title', 'System.WorkItemType'], null, null, 2)
+              .then(function(rows) {
+                return (rows || []).map(function(wi) {
+                  return { id: wi.id, title: wi.fields['System.Title'], type: wi.fields['System.WorkItemType'] };
+                });
+              });
+          });
+      }).then(function(results) {
+        statusEl.textContent = '';
+        if (!results.length) {
+          document.getElementById('tcItemList').innerHTML =
+            '<div class="tc-item-empty">No results for &ldquo;' + escapeHtml(q) + '&rdquo;</div>';
+        } else {
+          renderList(results, null);
+        }
+      }).catch(function() {
+        statusEl.textContent = '';
+        renderList([], 'Search failed — check your connection');
+      });
+    }
+
+    function doSave() {
+      var hours = parseFloat(document.getElementById('tcHours').value);
+      var date  = document.getElementById('tcDate').value;
+      var desc  = document.getElementById('tcDesc').value.trim();
+      var msgEl = document.getElementById('tcFormMsg');
+      function showErr(msg) {
+        msgEl.textContent = msg;
+        msgEl.className = 'message error';
+        msgEl.style.display = '';
+      }
+      if (!selectedItem)                      { showErr('Select a work item first'); return; }
+      if (!hours || hours <= 0 || hours > 24) { showErr('Enter valid hours (0.25–24)'); return; }
+      if (!date)                              { showErr('Pick a date'); return; }
+
+      var saveBtn = document.getElementById('tcSaveBtn');
+      saveBtn.disabled = true;
+      msgEl.style.display = 'none';
+
+      config.witClientGetter().then(function(c) {
+        return buildEntryForWorkItem(c, selectedItem.id, config.currentUser,
+          { hours: hours, date: date, description: desc });
+      }).then(function(entry) {
+        return saveEntry(config.dataService, entry);
+      }).then(function() {
+        close();
+        if (config.onSaved) config.onSaved();
+      }).catch(function(e) {
+        showErr('Error: ' + (e && e.message ? e.message : 'could not save'));
+        saveBtn.disabled = false;
+      });
+    }
+
+    document.getElementById('tcSearchInput').addEventListener('input', function(ev) {
+      clearTimeout(searchTimer);
+      var q = ev.target.value;
+      searchTimer = setTimeout(function() { doSearch(q); }, 300);
+    });
+    document.getElementById('tcSelectedChip').addEventListener('click', openSearch);
+    document.getElementById('tcSaveBtn').addEventListener('click', doSave);
+    document.getElementById('tcAddClose').addEventListener('click', close);
+    backdrop.addEventListener('click', function(ev) { if (ev.target === backdrop) close(); });
+    function onEsc(ev) { if (ev.key === 'Escape') close(); }
+    document.addEventListener('keydown', onEsc);
+
+    // Pre-fill for edit mode, otherwise start with the search open
+    if (config.initialItem) {
+      selectItem(config.initialItem);
+      if (config.initialHours !== undefined) document.getElementById('tcHours').value = config.initialHours;
+      if (config.initialDate)               document.getElementById('tcDate').value  = config.initialDate;
+      if (config.initialDesc)               document.getElementById('tcDesc').value  = config.initialDesc;
+    } else {
+      openSearch();
+    }
+  }
+
   global.TimeCore = {
     STORAGE_KEY_PREFIX: STORAGE_KEY_PREFIX,
     CLIENT_FIELD_REFS: CLIENT_FIELD_REFS,
@@ -267,6 +555,11 @@
     loadEntriesForKeys: loadEntriesForKeys,
     saveEntry: saveEntry,
     deleteEntryById: deleteEntryById,
-    buildEntryForWorkItem: buildEntryForWorkItem
+    EDIT_ICON: EDIT_ICON,
+    DELETE_ICON: DELETE_ICON,
+    escapeHtml: escapeHtml,
+    updateEntry: updateEntry,
+    buildEntryForWorkItem: buildEntryForWorkItem,
+    openAddEntryModal: openAddEntryModal
   };
 })(window);
diff --git a/src/time-entry.css b/src/time-entry.css
index d5582e1..1cf057c 100644
--- a/src/time-entry.css
+++ b/src/time-entry.css
@@ -1,5 +1,6 @@
-html, body { height: 100%; overflow: auto; }
-body { padding: 10px; }
+html, body { height: 100vh; overflow: hidden; }
+body { padding: 0; display: flex; flex-direction: column; }
+#app { flex: 1; min-height: 0; overflow-y: auto; padding: 10px; }
 
 #app { min-width: fit-content; }
 
@@ -7,7 +8,7 @@ body { padding: 10px; }
 
 .form-group { display: flex; flex-direction: column; gap: 4px; }
 
-label { font-weight: 600; color: var(--text-primary); }
+label { font-weight: 600; color: var(--text-primary) !important; }
 
 input, textarea { padding: 6px 8px; font-size: 14px; }
 
@@ -43,13 +44,6 @@ input, textarea { padding: 6px 8px; font-size: 14px; }
   color: var(--text-primary);
 }
 
-.delete-btn {
-  background: #d13438;
-  padding: 4px 8px;
-  font-size: 12px;
-}
-.delete-btn:hover { background: #a4262c; }
-
 .message { padding: 8px; border-radius: 4px; margin-bottom: 12px; }
 .message.success { background: var(--success-bg); color: var(--success-text); }
 .message.error   { background: var(--error-bg);   color: var(--error-text); }
diff --git a/src/time-entry.html b/src/time-entry.html
index effc2d5..332d2c9 100644
--- a/src/time-entry.html
+++ b/src/time-entry.html
@@ -5,6 +5,7 @@
   <title>Time Entry</title>
   <!-- Theme follows the Azure DevOps host (see applyDevOpsTheme) / saved user-theme; default is light, never the OS setting -->
   <script src="../lib/VSS.SDK.min.js"></script>
+  <script src="time-core.js"></script>
   <link rel="stylesheet" href="theme.css">
   <link rel="stylesheet" href="time-entry.css">
 </head>
@@ -55,11 +56,45 @@ <h3>Time Entries</h3>
     </div>
   </div>
 
+  <div id="editModal" class="edit-modal-backdrop" style="display:none;">
+    <div class="edit-modal-content">
+      <h3 style="margin:0;">Edit Time Entry</h3>
+      <div class="form-group">
+        <label for="editHours">Hours Spent</label>
+        <input type="number" id="editHours" min="0.25" max="24" step="0.25" onkeydown="return event.key !== 'e' && event.key !== 'E' && event.key !== '+' && event.key !== '-'">
+      </div>
+      <div class="form-group">
+        <label for="editDate">Date</label>
+        <input type="date" id="editDate">
+      </div>
+      <div class="form-group">
+        <label for="editDescription">Description (optional, max 100 chars)</label>
+        <textarea id="editDescription" rows="2" maxlength="100"></textarea>
+      </div>
+      <div class="edit-modal-actions">
+        <button id="editSaveBtn" onclick="saveEditEntry()">Save</button>
+        <button class="secondary" onclick="closeEditModal()">Cancel</button>
+      </div>
+    </div>
+  </div>
+
   <script>
     function applyDevOpsTheme() {
       function applyIfExplicit(t) {
         if (!t) return false;
-        // A non-empty theme that isn't a dark variant (e.g. "Default") means light.
+        // IMPORTANT — keep this simple toggle, do NOT copy the hub-page version here.
+        //
+        // This page runs as a sandboxed work-item-form contribution (cross-origin
+        // iframe). VSS context theme values are unreliable in this context, so the
+        // best-effort toggle below may be wrong. It does not matter: the async
+        // dataService.getValue('user-theme') call further down always overwrites it
+        // once it resolves. That async read is the real source of truth here.
+        //
+        // The hub-page version of applyIfExplicit returns false for unrecognised
+        // theme strings, letting execution fall through to the luminance-based
+        // parent-page background read. That fallback throws (cross-origin) in a
+        // sandboxed iframe, causing a flash to the wrong theme. Always returning
+        // true here prevents that fallback from running at all.
         document.documentElement.classList.toggle('dark', String(t).toLowerCase().indexOf('dark') !== -1);
         return true;
       }
@@ -94,14 +129,12 @@ <h3>Time Entries</h3>
     let currentUser = null;
     const STORAGE_KEY_PREFIX = "timetracker_";
     const LEGACY_STORAGE_KEY = "timetracker_entries";
-
-    // Helper function to get storage key for a given date
-    function getStorageKeyForDate(dateString) {
-      var date = new Date(dateString);
-      var year = date.getFullYear();
-      var month = String(date.getMonth() + 1).padStart(2, '0');
-      return STORAGE_KEY_PREFIX + year + "_" + month;
-    }
+    var TC = window.TimeCore;
+    var EDIT_ICON = TC.EDIT_ICON;
+    var DELETE_ICON = TC.DELETE_ICON;
+    var escapeHtml = TC.escapeHtml;
+    var editingEntryId = null;
+    var editingEntryOriginalDate = null;
 
     // Wait for VSS SDK to be available
     function initializeExtension() {
@@ -210,7 +243,7 @@ <h3>Time Entries</h3>
         // Group entries by month
         var entriesByMonth = {};
         legacyData.forEach(function(entry) {
-          var key = getStorageKeyForDate(entry.date);
+          var key = TC.getStorageKeyForDate(entry.date);
           if (!entriesByMonth[key]) {
             entriesByMonth[key] = [];
           }
@@ -275,7 +308,7 @@ <h3>Time Entries</h3>
 
     // Save a new entry to the appropriate monthly partition
     function saveEntry(entry) {
-      var storageKey = getStorageKeyForDate(entry.date);
+      var storageKey = TC.getStorageKeyForDate(entry.date);
       console.log("[TimeTracker] Saving entry to partition:", storageKey, "Entry:", entry);
 
       return window.dataService.getValue(storageKey, { scopeType: "Default" }).then(function(data) {
@@ -293,21 +326,6 @@ <h3>Time Entries</h3>
       });
     }
 
-    // Delete an entry from its monthly partition
-    function deleteEntryById(entryId, entryDate) {
-      var storageKey = getStorageKeyForDate(entryDate);
-
-      return window.dataService.getValue(storageKey, { scopeType: "Default" }).then(function(data) {
-        if (!data || data.length === 0) {
-          throw new Error("No entries found for this month — aborting delete to prevent data loss");
-        }
-        var filtered = data.filter(function(e) {
-          return e.id !== entryId;
-        });
-        return window.dataService.setValue(storageKey, filtered, { scopeType: "Default" });
-      });
-    }
-
     // Possible field reference names for Client (varies by where field was created in Azure DevOps)
     var CLIENT_FIELD_REFS = ["Custom.Client", "Custom.Planning_Client", "Planning.Client"];
     var PROJECT_FIELD_REFS = ["Custom.Project", "Custom.Planning_Project", "Planning.Project"];
@@ -354,10 +372,12 @@ <h3>Time Entries</h3>
         // This avoids 400 errors when some custom fields don't exist
 
         function createEntry(workItem) {
+          var ctx = VSS.getWebContext();
           return {
             id: Date.now().toString(),
             workItemId: workItemId,
             workItemTitle: workItem.fields["System.Title"],
+            teamProject: workItem.fields["System.TeamProject"] || (ctx.project || {}).name || "",
             parentId: workItem.fields["System.Parent"] || null,
             tags: workItem.fields["System.Tags"] || "",
             project: getFieldValue(workItem.fields, PROJECT_FIELD_REFS, "(No Project)"),
@@ -514,16 +534,17 @@ <h3>Time Entries</h3>
         }, 0);
 
         listEl.innerHTML = workItemEntries.map(function(e) {
-          var canDelete = e.userId === currentUser.id;
+          var canModify = e.userId === currentUser.id;
           return '<div class="time-entry-item">' +
             '<div class="entry-info">' +
               '<span class="entry-user">' + escapeHtml(e.userName) + '</span>' +
               '<span class="entry-date">' + e.date + '</span>' +
               (e.description ? '<span class="entry-description">' + escapeHtml(e.description) + '</span>' : '') +
             '</div>' +
-            '<div style="display: flex; align-items: center; gap: 8px;">' +
+            '<div style="display: flex; align-items: center; gap: 4px;">' +
               '<span class="entry-hours">' + e.hours + 'h</span>' +
-              (canDelete ? '<button class="delete-btn" onclick="deleteEntry(\'' + e.id + '\')">Delete</button>' : '') +
+              (canModify ? '<button class="icon-btn edit-btn" title="Edit" onclick="editEntry(\'' + e.id + '\')">' + EDIT_ICON + '</button>' : '') +
+              (canModify ? '<button class="icon-btn delete-btn" title="Delete" onclick="deleteEntry(\'' + e.id + '\')">' + DELETE_ICON + '</button>' : '') +
             '</div>' +
           '</div>';
         }).join("");
@@ -546,20 +567,18 @@ <h3>Time Entries</h3>
           showMessage("Entry not found", "error");
           return;
         }
+        if (!currentUser || entry.userId !== currentUser.id) {
+          showMessage("You can only delete your own entries", "error");
+          return;
+        }
 
-        return deleteEntryById(entryId, entry.date);
+        return TC.deleteEntryById(window.dataService, entryId, entry.date);
       }).then(function() {
         showMessage("Entry deleted", "success");
         loadTimeEntries();
       });
     }
 
-    function escapeHtml(text) {
-      var div = document.createElement("div");
-      div.textContent = text;
-      return div.innerHTML;
-    }
-
     // Setup field observer for state changes
     function setupFieldObserver() {
       VSS.require(["VSS/Service", "TFS/WorkItemTracking/Services"], function(VSS_Service, WIT_Services) {
@@ -609,11 +628,8 @@ <h3>Time Entries</h3>
       // Set default date to today
       nudgeDate.valueAsDate = new Date();
 
-      // Show the banner with animation
       banner.style.display = "block";
-
-      // Scroll to top to make it visible
-      window.scrollTo({ top: 0, behavior: "smooth" });
+      document.getElementById("app").scrollTo({ top: 0, behavior: "smooth" });
     }
 
     // Dismiss the nudge banner
@@ -650,6 +666,50 @@ <h3>Time Entries</h3>
       // Trigger the save
       saveTimeEntry();
     }
+
+    function editEntry(entryId) {
+      getAllEntries().then(function(entries) {
+        var entry = entries.find(function(e) { return e.id === entryId; });
+        if (!entry) { showMessage("Entry not found", "error"); return; }
+        if (!currentUser || entry.userId !== currentUser.id) { showMessage("You can only edit your own entries", "error"); return; }
+        editingEntryId = entryId;
+        editingEntryOriginalDate = entry.date;
+        document.getElementById("editHours").value = entry.hours;
+        document.getElementById("editDate").value = entry.date;
+        document.getElementById("editDescription").value = entry.description || "";
+        document.getElementById("editModal").style.display = "flex";
+      });
+    }
+
+    function closeEditModal() {
+      document.getElementById("editModal").style.display = "none";
+      editingEntryId = null;
+      editingEntryOriginalDate = null;
+    }
+
+    function saveEditEntry() {
+      var hours = parseFloat(document.getElementById("editHours").value);
+      var date = document.getElementById("editDate").value;
+      var description = document.getElementById("editDescription").value;
+      if (!hours || hours <= 0 || hours > 24) {
+        showMessage("Please enter valid hours (0.25 - 24)", "error");
+        return;
+      }
+      if (!date) {
+        showMessage("Please select a date", "error");
+        return;
+      }
+      document.getElementById("editSaveBtn").disabled = true;
+      TC.updateEntry(window.dataService, editingEntryId, editingEntryOriginalDate, { hours: hours, date: date, description: description })
+        .then(function() {
+          showMessage("Entry updated", "success");
+          closeEditModal();
+          loadTimeEntries();
+        }, function() {
+          showMessage("Failed to update entry", "error");
+          document.getElementById("editSaveBtn").disabled = false;
+        });
+    }
   </script>
 </body>
 </html>
diff --git a/src/time-report.css b/src/time-report.css
index a75b767..ca817aa 100644
--- a/src/time-report.css
+++ b/src/time-report.css
@@ -100,3 +100,4 @@ td { padding: 12px 16px; color: var(--text-primary); }
   color: var(--accent);
   font-weight: 600;
 }
+
diff --git a/src/time-report.html b/src/time-report.html
index 5d8317b..58c85ae 100644
--- a/src/time-report.html
+++ b/src/time-report.html
@@ -7,6 +7,7 @@
   <script src="../lib/VSS.SDK.min.js"></script>
   <link rel="stylesheet" href="theme.css">
   <link rel="stylesheet" href="time-report.css">
+  <script src="time-core.js"></script>
 </head>
 <body>
   <h1>Time Reports</h1>
@@ -56,6 +57,12 @@ <h1>Time Reports</h1>
       <button class="secondary" onclick="exportCSV()">Export CSV</button>
       <button class="secondary" onclick="exportBackupJSON()">Backup JSON</button>
     </div>
+    <div class="filters-add">
+      <button class="add-entry-btn" onclick="openAddEntry()" title="Add a new time entry">
+        <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"></line><line x1="5" y1="12" x2="19" y2="12"></line></svg>
+        Add Entry
+      </button>
+    </div>
   </div>
 
   <div class="summary-cards" id="summaryCards">
@@ -147,6 +154,47 @@ <h3>Work Items</h3>
     let filteredEntries = [];
     let currentView = "entries";
     var pendingFilters = null;
+    let currentUser = null;
+    var collectionUri = "";
+    var currentProjectName = "";
+    var TC = window.TimeCore;
+    var EDIT_ICON = TC.EDIT_ICON;
+    var DELETE_ICON = TC.DELETE_ICON;
+    var escapeHtml = TC.escapeHtml;
+    var editingEntryId = null;
+    var editingEntryOriginalDate = null;
+    var _witClient = null;
+
+    function getWitClient() {
+      if (_witClient) return Promise.resolve(_witClient);
+      return new Promise(function(resolve) {
+        VSS.require(['VSS/Service', 'TFS/WorkItemTracking/RestClient'], function(VSS_Service, WIT_Client) {
+          _witClient = VSS_Service.getCollectionClient(WIT_Client.WorkItemTrackingHttpClient);
+          resolve(_witClient);
+        });
+      });
+    }
+
+    function openAddEntry() {
+      var seen = {}, recent = [];
+      // Build recent list from current user's entries, newest first.
+      allEntries.filter(function(e) {
+        return currentUser && String(e.userId) === String(currentUser.id);
+      }).slice().sort(function(a, b) {
+        return b.date > a.date ? -1 : b.date < a.date ? 1 : 0;
+      }).forEach(function(e) {
+        var k = String(e.workItemId);
+        if (!seen[k]) { seen[k] = true; recent.push({ id: e.workItemId, title: e.workItemTitle || '(untitled)', type: null }); }
+      });
+      TC.openAddEntryModal({
+        dataService: window.dataService,
+        witClientGetter: getWitClient,
+        currentUser: currentUser,
+        projectName: currentProjectName,
+        recentItems: recent.slice(0, 20),
+        onSaved: function() { loadAllEntries(); }
+      });
+    }
 
     function parseHashString(hash) {
       if (!hash) return null;
@@ -184,14 +232,6 @@ <h3>Work Items</h3>
       });
     }
 
-    // Helper function to get storage key for a given date
-    function getStorageKeyForDate(dateString) {
-      var date = new Date(dateString);
-      var year = date.getFullYear();
-      var month = String(date.getMonth() + 1).padStart(2, '0');
-      return STORAGE_KEY_PREFIX + year + "_" + month;
-    }
-
     // Get all months between two dates
     function getMonthsBetween(startDate, endDate) {
       var months = [];
@@ -233,6 +273,12 @@ <h3>Work Items</h3>
           VSS.getService(VSS.ServiceIds.ExtensionData).then(function(dataService) {
             console.log("[TimeReport] Got extension data service");
             window.dataService = dataService;
+            try {
+              var ctx = VSS.getWebContext();
+              currentUser = ctx.user;
+              collectionUri = ((ctx.collection || {}).uri || "").replace(/\/$/, "");
+              currentProjectName = (ctx.project || {}).name || "";
+            } catch(e) {}
             try { dataService.setValue('user-theme', document.documentElement.classList.contains('dark') ? 'dark' : 'light', { scopeType: 'User' }); } catch(e) {}
 
             // Set default date range (last 30 days)
@@ -556,7 +602,7 @@ <h3>Work Items</h3>
       var thead = document.getElementById("tableHead");
       var tbody = document.getElementById("tableBody");
 
-      thead.innerHTML = "<tr><th>Date</th><th>User</th><th>Work Item</th><th>Parent</th><th>Epic</th><th>Tags</th><th>Hours</th><th>Description</th></tr>";
+      thead.innerHTML = "<tr><th>Date</th><th>User</th><th>Work Item</th><th>Parent</th><th>Epic</th><th>Tags</th><th>Hours</th><th>Description</th><th></th></tr>";
 
       var sorted = [...filteredEntries].sort((a, b) => new Date(b.date) - new Date(a.date));
 
@@ -571,15 +617,27 @@ <h3>Work Items</h3>
           parentDisplay = escapeHtml(e.parentTitle) + " <small class='text-muted'>(" + escapeHtml(e.parentType) + ")</small>";
         }
 
+        var canModify = currentUser && e.userId === currentUser.id;
+        var actionBtns = canModify
+          ? '<button class="icon-btn edit-btn" title="Edit" onclick="editEntry(\'' + e.id + '\')">' + EDIT_ICON + '</button>' +
+            '<button class="icon-btn delete-btn" title="Delete" onclick="deleteEntry(\'' + e.id + '\')">' + DELETE_ICON + '</button>'
+          : '';
+
+        var wiUrl = getWorkItemUrl(e);
+        var wiIdLabel = wiUrl
+          ? '<a href="' + wiUrl + '" target="_blank" rel="noopener noreferrer">#' + e.workItemId + '</a>'
+          : '#' + e.workItemId;
+
         return "<tr>" +
           "<td>" + e.date + "</td>" +
           "<td>" + escapeHtml(e.userName) + "</td>" +
-          "<td>" + escapeHtml(e.workItemTitle) + " (#" + e.workItemId + ")</td>" +
+          "<td>" + escapeHtml(e.workItemTitle) + " (" + wiIdLabel + ")</td>" +
           "<td>" + parentDisplay + "</td>" +
           "<td>" + (e.epicTitle ? escapeHtml(e.epicTitle) : "-") + "</td>" +
           "<td>" + tags + "</td>" +
           "<td><strong>" + e.hours + "h</strong></td>" +
           "<td>" + (e.description ? escapeHtml(e.description) : "-") + "</td>" +
+          "<td class='actions-cell'>" + actionBtns + "</td>" +
         "</tr>";
       }).join("");
     }
@@ -1099,12 +1157,87 @@ <h3>Work Items</h3>
       link.click();
     }
 
-    function escapeHtml(text) {
-      if (!text) return "";
-      var div = document.createElement("div");
-      div.textContent = text;
-      return div.innerHTML;
+    function getWorkItemUrl(entry) {
+      var base = collectionUri.replace(/\/$/, "");
+      var proj = entry.teamProject || currentProjectName || "";
+      if (!base || !proj) return null;
+      return base + "/" + encodeURIComponent(proj) + "/_workitems/edit/" + entry.workItemId;
+    }
+
+    function deleteEntry(entryId) {
+      if (!confirm("Delete this time entry?")) return;
+      var entry = allEntries.find(function(e) { return e.id === entryId; });
+      if (!entry) { alert("Entry not found"); return; }
+      if (!currentUser || entry.userId !== currentUser.id) { alert("You can only delete your own entries"); return; }
+      TC.deleteEntryById(window.dataService, entryId, entry.date).then(function() {
+        loadAllEntries();
+      }, function() {
+        alert("Failed to delete entry");
+      });
+    }
+
+    function editEntry(entryId) {
+      var entry = allEntries.find(function(e) { return e.id === entryId; });
+      if (!entry) { alert("Entry not found"); return; }
+      if (!currentUser || entry.userId !== currentUser.id) { alert("You can only edit your own entries"); return; }
+      editingEntryId = entryId;
+      editingEntryOriginalDate = entry.date;
+      document.getElementById("editHours").value = entry.hours;
+      document.getElementById("editDate").value = entry.date;
+      document.getElementById("editDescription").value = entry.description || "";
+      document.getElementById("editModal").style.display = "flex";
+    }
+
+    function closeEditModal() {
+      document.getElementById("editModal").style.display = "none";
+      editingEntryId = null;
+      editingEntryOriginalDate = null;
+    }
+
+    function saveEditEntry() {
+      var hours = parseFloat(document.getElementById("editHours").value);
+      var date = document.getElementById("editDate").value;
+      var description = document.getElementById("editDescription").value;
+      if (!hours || hours <= 0 || hours > 24) {
+        alert("Please enter valid hours (0.25 - 24)");
+        return;
+      }
+      if (!date) {
+        alert("Please select a date");
+        return;
+      }
+      document.getElementById("editSaveBtn").disabled = true;
+      TC.updateEntry(window.dataService, editingEntryId, editingEntryOriginalDate, { hours: hours, date: date, description: description })
+        .then(function() {
+          closeEditModal();
+          loadAllEntries();
+        }, function() {
+          alert("Failed to update entry");
+          document.getElementById("editSaveBtn").disabled = false;
+        });
     }
   </script>
+
+  <div id="editModal" class="edit-modal-backdrop" style="display:none;">
+    <div class="edit-modal-content">
+      <h3>Edit Time Entry</h3>
+      <div class="filter-group">
+        <label for="editHours">Hours Spent</label>
+        <input type="number" id="editHours" min="0.25" max="24" step="0.25" onkeydown="return event.key !== 'e' && event.key !== 'E' && event.key !== '+' && event.key !== '-'">
+      </div>
+      <div class="filter-group">
+        <label for="editDate">Date</label>
+        <input type="date" id="editDate">
+      </div>
+      <div class="filter-group">
+        <label for="editDescription">Description (optional, max 100 chars)</label>
+        <textarea id="editDescription" rows="3" maxlength="100" style="resize:vertical;"></textarea>
+      </div>
+      <div class="edit-modal-actions">
+        <button id="editSaveBtn" onclick="saveEditEntry()">Save</button>
+        <button class="secondary" onclick="closeEditModal()">Cancel</button>
+      </div>
+    </div>
+  </div>
 </body>
 </html>
diff --git a/vss-extension.dev.json b/vss-extension.dev.json
index 7c3aa93..a72eb57 100644
--- a/vss-extension.dev.json
+++ b/vss-extension.dev.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/vss-extension",
   "manifestVersion": 1,
   "id": "timetracker-extension-dev",
-  "version": "1.5.5",
+  "version": "1.5.14",
   "name": "Time Tracker (DEV)",
   "description": "[DEVELOPMENT] Simple time tracking for user stories with reporting by user, epic, tag and date range",
   "publisher": "miguelnicolas",
diff --git a/vss-extension.json b/vss-extension.json
index bef6f79..06208b2 100644
--- a/vss-extension.json
+++ b/vss-extension.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/vss-extension",
   "manifestVersion": 1,
   "id": "timetracker-extension",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "name": "Time Tracker",
   "description": "Simple time tracking for user stories with reporting by user, epic, tag and date range",
   "publisher": "miguelnicolas",