diff --git a/source/Ox.UI/js/Calendar/Calendar.js b/source/Ox.UI/js/Calendar/Calendar.js
index 17a6ac35..4d6a3fe7 100644
--- a/source/Ox.UI/js/Calendar/Calendar.js
+++ b/source/Ox.UI/js/Calendar/Calendar.js
@@ -332,7 +332,7 @@ Ox.Calendar = function(options, self) {
             })
             .appendTo(that);
 
-        self.$typeSelect = Ox.Select({
+        self.$menu = Ox.Select({
                 items: [
                     {id: 'date', title: 'Dates'},
                     {id: 'place', title: 'Places'},
@@ -341,9 +341,9 @@ Ox.Calendar = function(options, self) {
                 ],
                 max: -1,
                 min: 1,
-                title: 'Show...',
-                value: self.options.showTypes,
-                width: 80
+                title: 'set',
+                type: 'image',
+                value: self.options.showTypes
             })
             .css({float: 'left', margin: '4px'})
             .bindEvent({
@@ -534,7 +534,10 @@ Ox.Calendar = function(options, self) {
     });
 
     self.$eventControls = {
-        name: Ox.Label()
+        name: Ox.Label({
+                textAlign: 'center',
+                tooltip: 'Click to pan, doubleclick to zoom'
+            })
             .addClass('OxEventControl OxEventName')
             .css({bottom: 20 + (self.options.showZoombar * 16) + 'px'})
             .bindEvent({
@@ -548,6 +551,7 @@ Ox.Calendar = function(options, self) {
             .appendTo(that),
         deselectButton: Ox.Button({
                 title: 'close',
+                tooltip: 'Deselect',
                 type: 'image'
             })
             .addClass('OxEventControl OxEventDeselectButton')