diff --git a/pandora/annotation/models.py b/pandora/annotation/models.py
index a9534fe0..b8b5293c 100644
--- a/pandora/annotation/models.py
+++ b/pandora/annotation/models.py
@@ -103,10 +103,14 @@ class Annotation(models.Model):
 
         if filter(lambda l: l['type'] == 'place' or l.get('hasPlaces'),
                   settings.CONFIG['layers']):
-            update_matching_places.delay(self.id)
+            #update_matching_places.delay(self.id)
+            #editAnnotations needs to be in snyc
+            update_matching_places(self.id)
         if filter(lambda l: l['type'] == 'event' or l.get('hasEvents'),
                   settings.CONFIG['layers']):
-            update_matching_events.delay(self.id)
+            #update_matching_events.delay(self.id)
+            #editAnnotations needs to be in snyc
+            update_matching_events(self.id)
 
     def json(self, layer=False, keys=None, user=None):
         j = {
diff --git a/pandora/padma.jsonc b/pandora/padma.jsonc
index 3f96bb84..7f2c2359 100644
--- a/pandora/padma.jsonc
+++ b/pandora/padma.jsonc
@@ -517,7 +517,9 @@
     "user": {
         "level": "guest",
         "ui": {
+            "annotationsCalendarSize": 256,
             "annotationsFont": "small",
+            "annotationsMapSize": 256,
             "annotationsRange": "position",
             "annotationsSize": 256,
             "annotationsSort": "position",
@@ -555,6 +557,8 @@
             "page": "",
             "section": "items",
             "showAnnotations": true,
+            "showAnnotationsCalendar": true,
+            "showAnnotationsMap": true,
             "showBrowser": true,
             "showCalendarControls": true, // fixme: should be false
             "showFilters": true,
diff --git a/static/js/pandora/item.js b/static/js/pandora/item.js
index 9a74d445..c41db77c 100644
--- a/static/js/pandora/item.js
+++ b/static/js/pandora/item.js
@@ -218,7 +218,9 @@ pandora.ui.item = function() {
         } else if (pandora.user.ui.itemView == 'timeline') {
             pandora.$ui.contentPanel.replaceElement(1,
                 pandora.$ui.editor = Ox.VideoEditor({
+                    annotationsCalendarSize: pandora.user.ui.annotationsCalendarSize,
                     annotationsFont: pandora.user.ui.annotationsFont,
+                    annotationsMapSize: pandora.user.ui.annotationsMapSize,
                     annotationsRange: pandora.user.ui.annotationsRange,
                     annotationsSize: pandora.user.ui.annotationsSize,
                     annotationsSort: pandora.user.ui.annotationsSort,
@@ -254,6 +256,8 @@ pandora.ui.item = function() {
                         ? pandora.user.ui.item + '/' + pandora.user.ui.videoPoints[pandora.user.ui.item].annotation
                         : '',
                     showAnnotations: pandora.user.ui.showAnnotations,
+                    showAnnotationsCalendar: pandora.user.ui.showAnnotationsCalendar,
+                    showAnnotationsMap: pandora.user.ui.showAnnotationsMap,
                     showLargeTimeline: true,
                     showLayers: pandora.user.ui.showLayers,
                     showUsers: pandora.site.annotations.showUsers,
@@ -344,6 +348,8 @@ pandora.ui.item = function() {
                             value: data.value,
                         }, function(result) {
                             Ox.Log('', 'editAnnotation result', result);
+                            result.data.duration = result.data.out - result.data['in'];
+                            pandora.$ui.editor.updateAnnotation(data.layer, result.data);
                         });
                     },
                     removeannotation: function(data) {
diff --git a/static/js/pandora/navigationView.js b/static/js/pandora/navigationView.js
index 9e8248fd..a827165f 100644
--- a/static/js/pandora/navigationView.js
+++ b/static/js/pandora/navigationView.js
@@ -165,6 +165,8 @@ pandora.ui.navigationView = function(type, videoRatio) {
                     height: window.innerHeight - ui.showFilters * ui.filtersSize - 61,
                     range: [-5000, 5000],
                     showControls: ui.showCalendarControls,
+                    showToolbar: true,
+                    showZoombar: true,
                     width: window.innerWidth - ui.showSidebar * ui.sidebarSize - listSize - 2,
                     zoom: 4
                 })