=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2014-11-06 13:56:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2014-11-06 15:44:09 +0000
@@ -7196,9 +7196,6 @@
 				render: function() {
 					ns.app.viewport = this;
 
-                    var initEl = document.getElementById('init');
-                    initEl.parentNode.removeChild(initEl);
-
 					ns.app.aggregateLayoutWindow = AggregateLayoutWindow();
 					ns.app.aggregateLayoutWindow.hide();
 					ns.app.queryLayoutWindow = QueryLayoutWindow();
@@ -7256,12 +7253,18 @@
 						}
 					}
 
+                    var initEl = document.getElementById('init');
+                    initEl.parentNode.removeChild(initEl);
+
+                    Ext.getBody().setStyle('background', '#fff');
+                    Ext.getBody().setStyle('opacity', 0);
+
 					// fade in
 					Ext.defer( function() {
 						Ext.getBody().fadeIn({
-							duration: 500
+							duration: 600
 						});
-					}, 300);
+					}, 300 );
 				}
 			}
 		});
@@ -7381,6 +7384,7 @@
                                                 NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
 
                                                 if (keyUiLocale === defaultKeyUiLocale) {
+                                                    Ext.get('init').update(NS.i18n.initializing + '..');
                                                     fn();
                                                 }
                                                 else {
@@ -7392,7 +7396,10 @@
                                                         failure: function() {
                                                             console.log('No translations found for system locale (' + keyUiLocale + ')');
                                                         },
-                                                        callback: fn
+                                                        callback: function() {
+                                                            Ext.get('init').update(NS.i18n.initializing + '..');
+                                                            fn();
+                                                        }
                                                     });
                                                 }
                                             },
@@ -7401,6 +7408,7 @@
                                                     url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
                                                     success: function(r) {
                                                         NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+                                                        Ext.get('init').update(NS.i18n.initializing + '..');
                                                     },
                                                     failure: function() {
                                                         alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css	2014-11-03 11:47:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css	2014-11-06 15:44:09 +0000
@@ -59,14 +59,9 @@
     font-family: arial,sans-serif,ubuntu,consolas;
 }
 
-body.x-windows {
-	-webkit-text-stroke: 0.2px #888;
-}
-
 #init {
-    width: 100%;
-    text-align: center;
-    margin-top: 200px;
+    display: table;
+    margin: 200px auto;
     font-size: 15px;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2014-11-06 13:56:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2014-11-06 15:44:09 +0000
@@ -6825,9 +6825,6 @@
 				render: function() {
 					ns.app.viewport = this;
 
-                    var initEl = document.getElementById('init');
-                    initEl.parentNode.removeChild(initEl);
-
 					ns.app.aggregateLayoutWindow = AggregateLayoutWindow();
 					ns.app.aggregateLayoutWindow.hide();
 					ns.app.aggregateOptionsWindow = AggregateOptionsWindow();
@@ -6881,12 +6878,18 @@
 						}
 					}
 
+                    var initEl = document.getElementById('init');
+                    initEl.parentNode.removeChild(initEl);
+
+                    Ext.getBody().setStyle('background', '#fff');
+                    Ext.getBody().setStyle('opacity', 0);
+
 					// fade in
 					Ext.defer( function() {
 						Ext.getBody().fadeIn({
-							duration: 500
+							duration: 600
 						});
-					}, 300);
+					}, 300 );
 				}
 			}
 		});
@@ -7005,6 +7008,7 @@
                                                 NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
 
                                                 if (keyUiLocale === defaultKeyUiLocale) {
+                                                    Ext.get('init').update(NS.i18n.initializing + '..');
                                                     fn();
                                                 }
                                                 else {
@@ -7016,7 +7020,10 @@
                                                         failure: function() {
                                                             console.log('No translations found for system locale (' + keyUiLocale + ')');
                                                         },
-                                                        callback: fn
+                                                        callback: function() {
+                                                            Ext.get('init').update(NS.i18n.initializing + '..');
+                                                            fn();
+                                                        }
                                                     });
                                                 }
                                             },
@@ -7025,6 +7032,7 @@
                                                     url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
                                                     success: function(r) {
                                                         NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+                                                        Ext.get('init').update(NS.i18n.initializing + '..');
                                                     },
                                                     failure: function() {
                                                         alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/style.css	2014-10-22 16:41:32 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/style.css	2014-11-06 15:44:09 +0000
@@ -59,14 +59,9 @@
     font-family: arial,sans-serif,ubuntu,consolas;
 }
 
-body.x-windows {
-	-webkit-text-stroke: 0.2px #888;
-}
-
 #init {
-    width: 100%;
-    text-align: center;
-    margin-top: 200px;
+    display: table;
+    margin: 200px auto;
     font-size: 15px;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2014-11-06 13:56:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2014-11-06 15:44:09 +0000
@@ -9065,12 +9065,7 @@
 		});
 
 		onRender = function(vp) {
-            var initEl = document.getElementById('init');
-            initEl.parentNode.removeChild(initEl);
 
-			gis.olmap.mask = Ext.create('Ext.LoadMask', vp.getEl(), {
-				msg: 'Loading'
-			});
 		};
 
 		afterRender = function() {
@@ -9168,6 +9163,19 @@
 					}
 				}
 			}
+
+            var initEl = document.getElementById('init');
+            initEl.parentNode.removeChild(initEl);
+
+            Ext.getBody().setStyle('background', '#fff');
+            Ext.getBody().setStyle('opacity', 0);
+
+            // fade in
+            Ext.defer( function() {
+                Ext.getBody().fadeIn({
+                    duration: 600
+                });
+            }, 300 );
 		};
 
 		viewport = Ext.create('Ext.container.Viewport', {
@@ -9308,6 +9316,7 @@
                                                 GIS.i18n = dhis2.util.parseJavaProperties(r.responseText);
 
                                                 if (keyUiLocale === defaultKeyUiLocale) {
+                                                    Ext.get('init').update(GIS.i18n.initializing + '..');
                                                     fn();
                                                 }
                                                 else {
@@ -9319,7 +9328,10 @@
                                                         failure: function() {
                                                             console.log('No translations found for system locale (' + keyUiLocale + ')');
                                                         },
-                                                        callback: fn
+                                                        callback: function() {
+                                                            Ext.get('init').update(GIS.i18n.initializing + '..');
+                                                            fn();
+                                                        }
                                                     });
                                                 }
                                             },
@@ -9328,6 +9340,7 @@
                                                     url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
                                                     success: function(r) {
                                                         GIS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+                                                        Ext.get('init').update(GIS.i18n.initializing + '..');
                                                     },
                                                     failure: function() {
                                                         alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/style.css	2014-10-23 09:11:36 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/style.css	2014-11-06 15:44:09 +0000
@@ -53,9 +53,8 @@
 }
 
 #init {
-    width: 100%;
-    text-align: center;
-    margin-top: 200px;
+    display: table;
+    margin: 200px auto;
     font-size: 15px;
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties	2014-11-06 13:56:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties	2014-11-06 15:44:09 +0000
@@ -172,3 +172,4 @@
 last_52_weeks=Last 52 weeks
 last_6_months=Last 6 months
 created_by=Created by
+initializing=Initializing

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html	2014-08-31 15:21:11 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html	2014-11-06 15:44:09 +0000
@@ -12,6 +12,8 @@
 </head>
 
 <body>
+    <div id="init"></div>
+
     <script type="text/javascript" src="../dhis-web-commons/javascripts/ext/ext-all.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js"></script>
     <script type="text/javascript" src="../dhis-web-commons/javascripts/ext-ux/form/MultiSelect.js"></script>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2014-11-06 13:56:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2014-11-06 15:44:09 +0000
@@ -6122,10 +6122,16 @@
 						}
 					}
 
+                    var initEl = document.getElementById('init');
+                    initEl.parentNode.removeChild(initEl);
+
+                    Ext.getBody().setStyle('background', '#fff');
+                    Ext.getBody().setStyle('opacity', 0);
+
 					// fade in
 					Ext.defer( function() {
 						Ext.getBody().fadeIn({
-							duration: 500
+							duration: 600
 						});
 					}, 300 );
 				}
@@ -6170,7 +6176,7 @@
 				ns.app.viewport = createViewport();
 			}
 		};
-
+        
 		// requests
 		Ext.Ajax.request({
 			url: 'manifest.webapp',
@@ -6253,6 +6259,7 @@
                                                 NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
 
                                                 if (keyUiLocale === defaultKeyUiLocale) {
+                                                    Ext.get('init').update(NS.i18n.initializing + '..');
                                                     fn();
                                                 }
                                                 else {
@@ -6264,7 +6271,10 @@
                                                         failure: function() {
                                                             console.log('No translations found for system locale (' + keyUiLocale + ')');
                                                         },
-                                                        callback: fn
+                                                        callback: function() {
+                                                            Ext.get('init').update(NS.i18n.initializing + '..');
+                                                            fn();
+                                                        }
                                                     });
                                                 }
                                             },
@@ -6273,6 +6283,7 @@
                                                     url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
                                                     success: function(r) {
                                                         NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+                                                        Ext.get('init').update(NS.i18n.initializing + '..');
                                                     },
                                                     failure: function() {
                                                         alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css	2014-10-21 16:30:56 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css	2014-11-06 15:44:09 +0000
@@ -39,9 +39,12 @@
  *--------------------------------------------------------------------------*/
 
 body {
-	background-color: #e1e1e1;
-	opacity: 0;
-	filter:Alpha(opacity=0)
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
 }
 
 body,
@@ -54,20 +57,12 @@
 .x-window-header-text-default {
     font-size: 11px;
 	font-family: 'Arial','Sans-serif','Roboto','Helvetica','Consolas';
-}
-
-body {
-    font-size: 10px;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-body.x-windows {
-	-webkit-text-stroke: 0.2px #888;
+}                                  
+
+#init {
+    display: table;
+    margin: 200px auto;
+    font-size: 15px;
 }
 
 	/* Scrollbar Webkit */

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties	2014-11-06 14:00:37 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties	2014-11-06 15:44:09 +0000
@@ -245,3 +245,4 @@
 last_52_weeks=Last 52 weeks
 last_6_months=Last 6 months
 created_by=Created by
+initializing=Initializing

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html	2014-08-31 15:21:11 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html	2014-11-06 15:44:09 +0000
@@ -11,6 +11,8 @@
 </head>
 
 <body>
+    <div id="init"></div>
+    
     <form id="exportForm" method="post">
         <input type="hidden" id="svgField" name="svg"/>
         <input type="hidden" id="filenameField" name="filename"/>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2014-11-06 13:56:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2014-11-06 15:44:09 +0000
@@ -6062,12 +6062,18 @@
 						}
 					}
 
-					// Fade in
+                    var initEl = document.getElementById('init');
+                    initEl.parentNode.removeChild(initEl);
+
+                    Ext.getBody().setStyle('background', '#fff');
+                    Ext.getBody().setStyle('opacity', 0);
+
+					// fade in
 					Ext.defer( function() {
 						Ext.getBody().fadeIn({
-							duration: 400
+							duration: 600
 						});
-					}, 500 );
+					}, 300 );
                 }
             }
         });
@@ -6193,6 +6199,7 @@
                                                 NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
 
                                                 if (keyUiLocale === defaultKeyUiLocale) {
+                                                    Ext.get('init').update(NS.i18n.initializing + '..');
                                                     fn();
                                                 }
                                                 else {
@@ -6204,7 +6211,10 @@
                                                         failure: function() {
                                                             console.log('No translations found for system locale (' + keyUiLocale + ')');
                                                         },
-                                                        callback: fn
+                                                        callback: function() {
+                                                            Ext.get('init').update(NS.i18n.initializing + '..');
+                                                            fn();
+                                                        }
                                                     });
                                                 }
                                             },
@@ -6213,6 +6223,7 @@
                                                     url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
                                                     success: function(r) {
                                                         NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+                                                        Ext.get('init').update(NS.i18n.initializing + '..');
                                                     },
                                                     failure: function() {
                                                         alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css	2014-10-21 16:30:56 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css	2014-11-06 15:44:09 +0000
@@ -35,9 +35,12 @@
 /* General */
 
 body {
-	background-color: #e1e1e1;
-	opacity: 0;
-	filter:Alpha(opacity=0)
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
 }
 
 body,
@@ -50,20 +53,12 @@
 .x-window-header-text-default {
     font-size: 11px;
 	font-family: 'Arial','Sans-serif','Roboto','Helvetica','Consolas';
-}
-
-body {
-    font-size: 10px;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-body.x-windows {
-	-webkit-text-stroke: 0.2px #888;
+}                                
+
+#init {
+    display: table;
+    margin: 200px auto;
+    font-size: 15px;
 }
 
 	/* Scrollbar Webkit */