diff --git a/source/UI/css/UI.css b/source/UI/css/UI.css
index 35401671..e6ea4dca 100644
--- a/source/UI/css/UI.css
+++ b/source/UI/css/UI.css
@@ -2275,6 +2275,11 @@ Scrollbars
     border-radius: 8px;
 }
 
+body {
+ scrollbar-width: thin;
+ scrollbar-width: 8px;
+}
+
 /*
 ================================================================================
 SourceViewer
diff --git a/source/UI/css/theme.css b/source/UI/css/theme.css
index 91427838..5c62887e 100644
--- a/source/UI/css/theme.css
+++ b/source/UI/css/theme.css
@@ -1188,6 +1188,10 @@ Scrollbars
     background: -webkit-linear-gradient(left, $buttonActiveGradient);
 }
 
+body.$themeClass {
+ scrollbar-color: $bodyBorder $bodyBackground;
+}
+
 /*
 ================================================================================
 SourceViewer
diff --git a/source/UI/js/Core/UI.js b/source/UI/js/Core/UI.js
index fc88c661..b3b7aebe 100644
--- a/source/UI/js/Core/UI.js
+++ b/source/UI/js/Core/UI.js
@@ -47,7 +47,7 @@ Ox.SCROLLBAR_SIZE = Ox.UI.SCROLLBAR_SIZE = $.browser.webkit ? 8 : (function() {
     width = 1 + width - (inner[0].offsetWidth == width
         ? outer[0].clientWidth : inner[0].offsetWidth);
     outer.remove();
-    return width;
+    return width + width % 2;
 })();
 
 //@ Ox.UI.PATH <str> Path of Ox UI
diff --git a/source/UI/js/Video/VideoAnnotationPanel.js b/source/UI/js/Video/VideoAnnotationPanel.js
index cc788b0b..4700b283 100644
--- a/source/UI/js/Video/VideoAnnotationPanel.js
+++ b/source/UI/js/Video/VideoAnnotationPanel.js
@@ -16,7 +16,6 @@ Ox.VideoAnnotationPanel <f> VideoAnnotationPanel Object
         downloadframe <!> downloadframe
         downloadvideo <!> downloadvideo
         editannotation <!> editannotation
-        editannotation <!> editannotation
         embedselection <!> embedselection
         findannotations <!> findannotations
         find <!> find
@@ -1720,17 +1719,15 @@ Ox.VideoAnnotationPanel = function(options, self) {
         // id might have changed if new annotation was created
         if (annotation.id) {
             self.options.selected = annotation.id;
-            var layer = Ox.getObjectById(self.options.layers, annotation.layer);
-            var item = Ox.getObjectById(layer.items, annotation.id);
-            if (!item) {
-                layer.items.push(annotation);
-                self.annotations = getAnnotations();
-            }
         }
         if (getSelectedLayer() == self.options.subtitlesLayer) {
             updateSubtitles();
         }
         self.$annotationPanel.updateItem(id, annotation);
+        if (id != annotation.id) {
+            self.annotations = getAnnotations();
+            setTimelineState();
+        }
     };
 
     /*@