=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties	2012-06-04 09:34:56 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties	2012-06-04 13:08:06 +0000
@@ -1,12 +1,12 @@
 title=DHIS 2 Data Visualizer
 chart_type=Chart type
-column_chart= Column chart
-stacked_column_chart=Stacked column chart
-bar_chart=Bar chart
-stacked_bar_chart=Stacked bar chart
-line_chart=Line chart
-area_chart=Area chart
-pie_chart=Pie chart
+column_chart= Column
+stacked_column_chart=Stacked column
+bar_chart=Bar
+stacked_bar_chart=Stacked bar
+line_chart=Line
+area_chart=Area
+pie_chart=Pie
 series=Series
 category=Category
 filter=Filter
@@ -126,4 +126,6 @@
 share = Share
 interpretation = interpretation
 write_your_interpretation = Write your interpretation
-interpretation_was_shared = Interpretation was shared
\ No newline at end of file
+interpretation_was_shared = Interpretation was shared
+save_load_favorite_before_sharing = Please save or load a favorite before sharing
+create_chart_before_datatable = Please create a chart before opening the datatable

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-06-04 09:34:56 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2012-06-04 13:08:06 +0000
@@ -1918,6 +1918,7 @@
 			render: function() {
 				if (!DV.c.rendered) {
 					DV.cmp.toolbar.datatable.enable();
+					DV.cmp.toolbar.datatable.setTooltip('');
 					DV.c.rendered = true;
 				}
 			},
@@ -2421,7 +2422,6 @@
 								xtype: 'button',
                                 icon: 'images/column.png',
                                 name: DV.conf.finals.chart.column,
-                                tooltip: DV.i18n.column_chart,
 								width: 40,
                                 pressed: true
                             },
@@ -2429,42 +2429,36 @@
 								xtype: 'button',
                                 icon: 'images/column-stacked.png',
                                 name: DV.conf.finals.chart.stackedcolumn,
-                                tooltip: DV.i18n.stacked_column_chart,
 								width: 40
                             },
                             {
 								xtype: 'button',
                                 icon: 'images/bar.png',
                                 name: DV.conf.finals.chart.bar,
-                                tooltip: DV.i18n.bar_chart,
 								width: 40
                             },
                             {
 								xtype: 'button',
                                 icon: 'images/bar-stacked.png',
                                 name: DV.conf.finals.chart.stackedbar,
-                                tooltip: DV.i18n.stacked_bar_chart,
 								width: 40
                             },
                             {
 								xtype: 'button',
                                 icon: 'images/line.png',
                                 name: DV.conf.finals.chart.line,
-                                tooltip: DV.i18n.line_chart,
 								width: 40
                             },
                             {
 								xtype: 'button',
                                 icon: 'images/area.png',
                                 name: DV.conf.finals.chart.area,
-                                tooltip: DV.i18n.area_chart,
 								width: 40
                             },
                             {
 								xtype: 'button',
                                 icon: 'images/pie.png',
                                 name: DV.conf.finals.chart.pie,
-                                tooltip: DV.i18n.pie_chart,
 								width: 40
                             }
                         ]
@@ -3597,7 +3591,6 @@
                             name: 'resizewest',
 							cls: 'dv-toolbar-btn-2',
                             text: '<<<',
-                            tooltip: DV.i18n.show_hide_chart_settings,
                             handler: function() {
                                 var p = DV.cmp.region.west;
                                 if (p.collapsed) {
@@ -4183,9 +4176,11 @@
 							xable: function() {
 								if (DV.c.currentFavorite) {
 									this.enable();
+									this.setTooltip('');
 								}
 								else {
 									this.disable();
+									this.setTooltip(DV.i18n.save_load_favorite_before_sharing);
 								}
 							},
 							handler: function() {
@@ -4324,6 +4319,7 @@
 							cls: 'dv-toolbar-btn-2',
                             text: DV.i18n.data_table,
                             disabled: true,
+                            tooltip: DV.i18n.create_chart_before_datatable,
                             handler: function() {
                                 var p = DV.cmp.region.east;
                                 if (p.collapsed && p.items.length) {
@@ -4356,7 +4352,6 @@
                             name: 'resizeeast',
 							cls: 'dv-toolbar-btn-2',
                             text: '>>>',
-                            tooltip: DV.i18n.hide_data_table,
                             hidden: true,
                             handler: function() {
                                 DV.cmp.region.east.collapse();

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-06-04 09:34:56 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/css/style.css	2012-06-04 13:08:06 +0000
@@ -341,15 +341,15 @@
     -ms-border-radius: 2px 2px 2px 2px;
     -khtml-border-radius: 2px 2px 2px 2px;
     border-radius: 2px 2px 2px 2px;
-    padding: 0 2px;
-    border-width: 2px;
-    border-style: solid;
-    background-color: #f1f1f1;
+    padding: 3px 4px;
+    border: 1px solid #444;
+    background-color: #444;
 }
 
 .x-tip .x-tip-body {
-	padding: 4px 5px 5px 5px;
-	font-size: 12px;
+	font-size: 11px;
+	font-weight: bold;
+	color: #fff;
 }
 
 /* Chart tips (tooltip) */
@@ -506,11 +506,30 @@
 }
 
 /* Chart tips */
-.dv-chart-tips .x-tip-body {
-    font-size: 27px;
+.dv-chart-tips, .dv-chart-tips-pie {
+    -moz-border-radius: 2px 2px 2px 2px;
+    -webkit-border-radius: 2px 2px 2px 2px;
+    -o-border-radius: 2px 2px 2px 2px;
+    -ms-border-radius: 2px 2px 2px 2px;
+    -khtml-border-radius: 2px 2px 2px 2px;
+    border-radius: 2px 2px 2px 2px;
+    padding: 3px 4px 2px;
+    border: 2px solid #777;
+    background-color: #f1f1f1;
+}
+.dv-chart-tips-pie {
+    padding: 3px 4px;
+}
+
+.dv-chart-tips .x-tip-body, .dv-chart-tips-pie .x-tip-body {
+    padding: 4px;
+    background-color: #f1f1f1;
+    font-size: 20px;
+    font-weight: normal;
+    color: #444;
 }
 .dv-chart-tips-pie .x-tip-body {
-    font-size: 17px;
+	font-size: 13px;
 }
 
 /* Window */

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm	2012-06-04 09:34:56 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm	2012-06-04 13:08:06 +0000
@@ -125,6 +125,8 @@
 share:'$encoder.jsEscape($i18n.getString( 'share' ) , "'")',
 interpretation:'$encoder.jsEscape($i18n.getString( 'interpretation' ) , "'")',
 write_your_interpretation:'$encoder.jsEscape($i18n.getString( 'write_your_interpretation' ) , "'")',
-interpretation_was_shared:'$encoder.jsEscape($i18n.getString( 'interpretation_was_shared' ) , "'")'
+interpretation_was_shared:'$encoder.jsEscape($i18n.getString( 'interpretation_was_shared' ) , "'")',
+save_load_favorite_before_sharing:'$encoder.jsEscape($i18n.getString( 'save_load_favorite_before_sharing' ) , "'")',
+create_chart_before_datatable:'$encoder.jsEscape($i18n.getString( 'create_chart_before_datatable' ) , "'")'
 
 };
\ No newline at end of file