=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2012-10-15 08:33:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2012-10-16 11:08:57 +0000
@@ -47,7 +47,7 @@
   color:#3162C5;
 }
 
-input[type=text],textarea
+input[type=text],input[type=password],textarea
 {
   border: 1px solid #aaa;
   padding: 4px 1px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2012-10-15 08:33:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2012-10-16 11:08:57 +0000
@@ -47,7 +47,7 @@
   color:#3b73b8;
 }
 
-input[type=text],textarea
+input[type=text],input[type=password],textarea
 {
   border: 1px solid #aaa;
   padding: 4px 1px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2012-10-15 08:33:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2012-10-16 11:08:57 +0000
@@ -47,7 +47,7 @@
   color: #3162C5;
 }
 
-input[type=text],textarea
+input[type=text],input[type=password],textarea
 {
   border: 1px solid #aaa;
   padding: 4px 1px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-10-11 11:56:28 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2012-10-16 11:08:57 +0000
@@ -24,6 +24,12 @@
   color: #fff;
 }
 
+input[type=text],input[type=password]
+{
+  border: 1px solid #aaa;
+  padding: 3px 1px;
+}
+
 #flagArea
 {
   position: absolute;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2012-10-15 08:33:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2012-10-16 11:08:57 +0000
@@ -47,7 +47,7 @@
   color:#3b73b8;
 }
 
-input[type=text],textarea
+input[type=text],input[type=password],textarea
 {
   border: 1px solid #aaa;
   padding: 4px 1px;

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/index.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/index.vm	2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/index.vm	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<script type="text/javascript">
-jQuery(function() {
-	/* make sure that the leftBar is always visible when entering page. */
-	leftBar.showAnimated()
-});
-</script>
-
-<h3>$i18n.getString( "settings" )</h3>
-
-<ul class="introList">
-    #introListImgItem( "userGeneralSettings.action" "user_general_settings" "usersettings" )
-    #introListImgItem( "userMessageSettings.action" "user_message_settings" "usersettings" )
-</ul>
-    

=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/settingsMenu.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/settingsMenu.vm	2012-10-07 07:26:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/settingsMenu.vm	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-<h2>$i18n.getString( "user_settings" )&nbsp;</h2>
-<ul>
-	<li><a href="userGeneralSettings.action">$i18n.getString( "general" )&nbsp;</a></li>
-	<li><a href="userMessageSettings.action">$i18n.getString( "message" )&nbsp;</a></li>
-</ul>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-10-12 17:04:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-10-16 11:08:57 +0000
@@ -107,10 +107,11 @@
 	  
 	  <div id="menuDropDown4" class="menuDropDownArea">
 	  <ul class="menuDropDownBox">
-  	    <li><a style="width:159px; padding-left:20px;" href="../dhis-web-commons-about/userGeneralSettings.action">$i18n.getString( "settings" )&nbsp;</a></li>
-        <li><a style="width:159px; padding-left:20px;" href="../dhis-web-commons-about/showUpdateUserProfileForm.action">$i18n.getString( "profile" )&nbsp;</a></li>
-  	    <li><a style="width:159px; padding-left:20px;" href="../dhis-web-commons-about/showUpdateUserAccountForm.action">$i18n.getString( "account" )&nbsp;</a></li>
-        <li><a style="width:159px; padding-left:20px;" href="../dhis-web-commons-security/logout.action">$i18n.getString( "log_out" )&nbsp;</a></li>
+  	    <li><a href="../dhis-web-commons-about/userGeneralSettings.action">$i18n.getString( "general_settings" )&nbsp;</a></li>
+        <li><a href="../dhis-web-commons-about/userMessageSettings.action">$i18n.getString( "message_settings" )&nbsp;</a></li>
+        <li><a href="../dhis-web-commons-about/showUpdateUserProfileForm.action">$i18n.getString( "profile" )&nbsp;</a></li>
+  	    <li><a href="../dhis-web-commons-about/showUpdateUserAccountForm.action">$i18n.getString( "account" )&nbsp;</a></li>
+        <li><a href="../dhis-web-commons-security/logout.action">$i18n.getString( "log_out" )&nbsp;</a></li>
       </ul>
 	  </div>
 	  

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2012-10-11 17:21:32 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml	2012-10-16 11:08:57 +0000
@@ -885,11 +885,10 @@
 
 	<!-- User settings -->
 	
-		<!-- General settings -->
     <action name="userGeneralSettings" class="org.hisp.dhis.settings.user.action.GetGeneralSettingsAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-commons/settings/userGeneralSettings.vm</param>
-      <param name="menu">/dhis-web-commons/settings/settingsMenu.vm</param>
+      <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
     </action>
 
     <action name="setUserGeneralSettings" class="org.hisp.dhis.settings.user.action.SetGeneralSettingsAction">
@@ -898,12 +897,10 @@
 	  <param name="onExceptionReturn">plainTextError</param>
     </action>
 		
-		<!-- Message notification settings -->
-
     <action name="userMessageSettings" class="org.hisp.dhis.settings.user.action.GetMessageSettingsAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-commons/settings/userMessageSettings.vm</param>
-      <param name="menu">/dhis-web-commons/settings/settingsMenu.vm</param>
+      <param name="menu">/dhis-web-commons/about/menuDashboard.vm</param>
     </action>
 
     <action name="setUserMessageSettings" class="org.hisp.dhis.settings.user.action.SetMessageSettingsAction">

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-10-11 16:02:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-10-16 11:08:57 +0000
@@ -336,7 +336,8 @@
 dashboard=Dashboard
 messages=Messages
 interpretations=Interpretations
-
+general_settings=General Settings
+message_settings=Message Settings
 
 #-- Change Log------------------------------------------------------------------#