diff --git a/source/Ox.UI/js/Video/VideoEditor.js b/source/Ox.UI/js/Video/VideoEditor.js
index 0a8f41c6..29923614 100644
--- a/source/Ox.UI/js/Video/VideoEditor.js
+++ b/source/Ox.UI/js/Video/VideoEditor.js
@@ -207,7 +207,7 @@ Ox.VideoEditor = function(options, self) {
                     setPoint('in', self.options.position);
                 },
                 key_left: function() {
-                    movePositionBy(-0.04);
+                    movePositionBy(-1 / self.options.fps);
                 },
                 key_minus: function() {
                     self.$player[0].changeVolume(-0.1);
@@ -225,7 +225,7 @@ Ox.VideoEditor = function(options, self) {
                 },
                 key_p: playInToOut,
                 key_right: function() {
-                    movePositionBy(0.04);
+                    movePositionBy(1 / self.options.fps);
                 },
                 key_shift_0: function() {
                     movePositionBy(-self.options.position);
@@ -241,12 +241,12 @@ Ox.VideoEditor = function(options, self) {
                         getNextAnnotation('result', -1)
                     );
                 },
-                key_shift_left: function() {
-                    movePositionBy(-1);
-                },
                 key_shift_i: function() {
                     goToPoint('in');
                 },
+                key_shift_left: function() {
+                    movePositionBy(-1);
+                },
                 key_shift_minus: function() {
                     self.options.videoSize == 'large' && toggleSize();
                 },
@@ -262,9 +262,7 @@ Ox.VideoEditor = function(options, self) {
                 key_shift_up: function() {
                     movePositionBy(-self.options.position);
                 },
-                key_slash: function() {
-                    selectCut();
-                },
+                key_slash: selectCut,
                 key_space: togglePaused,
                 key_up: function() {
                     movePositionBy(-self.sizes.timeline[0].width);
@@ -1183,7 +1181,6 @@ Ox.VideoEditor = function(options, self) {
     }
 
     function setPoint(point, position, keepSelected) {
-        var otherPoint = point == 'in' ? 'out' : 'in';
         self.options[point] = position;
         if (self.options.selected && !self.editing && !keepSelected) {
             selectAnnotation({id: ''});
@@ -1224,17 +1221,11 @@ Ox.VideoEditor = function(options, self) {
         var minute = Math.floor(position / 60),
             previousMinute = Math.floor(self.options.position / 60);
         self.options.position = position;
-        !playing && self.$player[0].options({
-            position: self.options.position
-        });
+        !playing && self.$player[0].options({position: self.options.position});
         self.$timeline.forEach(function($timeline) {
-            $timeline.options({
-                position: self.options.position
-            });
-        });
-        self.$annotationPanel.options({
-            position: self.options.position
+            $timeline.options({position: self.options.position});
         });
+        self.$annotationPanel.options({position: self.options.position});
         if (!playing || minute != previousMinute) {
             that.triggerEvent(playing ? 'playing' : 'position', {
                 position: !playing ? self.options.position : minute * 60