diff --git a/source/Ox.UI/js/Form/Ox.Form.js b/source/Ox.UI/js/Form/Ox.Form.js
index 33bdd424..ac8d62cd 100644
--- a/source/Ox.UI/js/Form/Ox.Form.js
+++ b/source/Ox.UI/js/Form/Ox.Form.js
@@ -23,6 +23,8 @@ Ox.Form = function(options, self) {
                 error: '',
                 id: '',
                 items: [],
+                // FIXME: don't pass function,
+                // listen to event instead!
                 submit: null
             })
             .options(options || {}) // fixme: the || {} can be done once, in the options function
diff --git a/source/Ox.UI/js/List/Ox.List.js b/source/Ox.UI/js/List/Ox.List.js
index 35dff95e..48b2de86 100644
--- a/source/Ox.UI/js/List/Ox.List.js
+++ b/source/Ox.UI/js/List/Ox.List.js
@@ -1694,12 +1694,12 @@ Ox.List = function(options, self) {
         Ox.Log('List', 'that.value id key value', id, key, value)
         var pos = Ox.isNumber(id) ? id : getPositionById(id),
             $item = self.$items[pos],
-            data = $item.options('data');
+            data = $item ? $item.options('data') : {};
         if (arguments.length == 1) {
             return data;
         } else if (arguments.length == 2) {
             return data[key];
-        } else {
+        } else if ($item) {
             if (key == self.options.unique) {
                 // unique id has changed
                 self.options.selected = self.options.selected.map(function(id_) {
diff --git a/source/Ox.UI/js/Menu/Ox.MainMenu.js b/source/Ox.UI/js/Menu/Ox.MainMenu.js
index 04fb3b24..4abed19f 100644
--- a/source/Ox.UI/js/Menu/Ox.MainMenu.js
+++ b/source/Ox.UI/js/Menu/Ox.MainMenu.js
@@ -140,8 +140,7 @@ Ox.MainMenu = function(options, self) {
     checkItem <f> checkItem
     @*/
     that.checkItem = function(id) {
-        var ids = id.split('_');
-        that.getMenu(ids.shift()).checkItem(ids.join('_'));
+        that.getItem(id).options({checked: true});
         return that;
     };
 
diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js
index cab0f7af..1f38ba9e 100644
--- a/source/Ox.UI/js/Video/Ox.VideoEditor.js
+++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js
@@ -315,8 +315,7 @@ Ox.VideoEditor = function(options, self) {
                     selectAnnotation(data);
                 },
                 submit: updateAnnotation
-            });
-        self.$annotationPanel[i]
+            })
             .appendTo(self.$annotations);
     });
 
diff --git a/source/Ox.UI/themes/classic/css/classic.css b/source/Ox.UI/themes/classic/css/classic.css
index 0ec20988..5183a82d 100644
--- a/source/Ox.UI/themes/classic/css/classic.css
+++ b/source/Ox.UI/themes/classic/css/classic.css
@@ -721,6 +721,9 @@ Miscellaneous
 .OxThemeClassic .OxSelectable.OxSelected {
     background: rgb(224, 224, 224);
 }
+.OxThemeClassic .OxSelectable.OxSelected.OxFocus {
+    background: rgb(208, 208, 208);
+}
 
 .OxThemeClassic .OxScreen {
     background: rgb(224, 224, 224);