diff --git a/source/Ox.UI/js/Calendar/CalendarEditor.js b/source/Ox.UI/js/Calendar/CalendarEditor.js
index 916e22fb..3a554050 100644
--- a/source/Ox.UI/js/Calendar/CalendarEditor.js
+++ b/source/Ox.UI/js/Calendar/CalendarEditor.js
@@ -449,26 +449,26 @@ Ox.CalendarEditor = function(options, self) {
         size: 24
     });
 
-    self.$newEventButton = Ox.Button({
-            title: 'New Event',
-            width: 70
-        })
-        .css({float: 'left', margin: '4px'})
-        .bindEvent({
-            click: addEvent
-        })
-        .appendTo(self.$eventStatusbar);
-
     self.$removeEventButton = Ox.Button({
             title: 'Remove Event',
             width: 90
         })
-        .css({float: 'right', margin: '4px'})
+        .css({float: 'left', margin: '4px'})
         .bindEvent({
             click: removeEvent
         })
         .hide()
         .appendTo(self.$eventStatusbar);
+    
+    self.$newEventButton = Ox.Button({
+            title: 'New Event',
+            width: 70
+        })
+        .css({float: 'right', margin: '4px'})
+        .bindEvent({
+            click: addEvent
+        })
+        .appendTo(self.$eventStatusbar);
 
     if (self.options.mode == 'define') {
         self.$defineEventButton = Ox.Button({
diff --git a/source/Ox.UI/js/Map/MapEditor.js b/source/Ox.UI/js/Map/MapEditor.js
index 827f1d47..25e67047 100644
--- a/source/Ox.UI/js/Map/MapEditor.js
+++ b/source/Ox.UI/js/Map/MapEditor.js
@@ -642,23 +642,11 @@ Ox.MapEditor = function(options, self) {
         size: 24
     });
 
-    self.$newPlaceButton = Ox.Button({
-            title: 'New Place',
-            width: 70
-        })
-        .css({float: 'left', margin: '4px'})
-        .bindEvent({
-            click: function() {
-                self.$map.newPlace();
-            }
-        })
-        .appendTo(self.$placeStatusbar);
-
     self.$addPlaceButton = Ox.Button({
             title: 'Add Place',
             width: 90
         })
-        .css({float: 'right', margin: '4px'})
+        .css({float: 'left', margin: '4px'})
         .bindEvent({
             click: function() {
                 if (this.options('title') == 'Add Place') {
@@ -671,6 +659,18 @@ Ox.MapEditor = function(options, self) {
         .hide()
         .appendTo(self.$placeStatusbar);
 
+    self.$newPlaceButton = Ox.Button({
+            title: 'New Place',
+            width: 70
+        })
+        .css({float: 'right', margin: '4px'})
+        .bindEvent({
+            click: function() {
+                self.$map.newPlace();
+            }
+        })
+        .appendTo(self.$placeStatusbar);
+
     if (self.options.mode == 'define') {
         self.$definePlaceButton = Ox.Button({
                 title: 'Define Place',