=== 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-08 14:17:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2012-10-11 14:21:08 +0000
@@ -179,6 +179,13 @@
   left: 780px;
 }
 
+div#menuDropDown4
+{
+  position: absolute;
+  top: 44px;
+  left: 780px;
+}
+
 .menuDropDownArea
 {
   font-size: 12px;

=== 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-08 14:17:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2012-10-11 14:21:08 +0000
@@ -200,6 +200,13 @@
   left: 780px;
 }
 
+div#menuDropDown4
+{
+  position: absolute;
+  top: 44px;
+  left: 780px;
+}
+
 .menuDropDownArea
 {
   font-size: 12px;

=== 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-08 14:17:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2012-10-11 14:21:08 +0000
@@ -180,6 +180,13 @@
   left: 780px;
 }
 
+div#menuDropDown4
+{
+  position: absolute;
+  top: 44px;
+  left: 780px;
+}
+
 .menuDropDownArea
 {
   font-size: 12px;

=== 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-08 14:17:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2012-10-11 14:21:08 +0000
@@ -179,6 +179,13 @@
   left: 780px;
 }
 
+div#menuDropDown4
+{
+  position: absolute;
+  top: 44px;
+  left: 780px;
+}
+
 .menuDropDownArea
 {
   font-size: 12px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm	2012-10-07 20:10:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm	2012-10-11 14:21:08 +0000
@@ -1,8 +1,6 @@
 <script type="text/javascript" src="../dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js"></script>
 
-<h3>$i18n.getString( "update_user" )
-<a href="showUpdateUserProfileForm.action" title="$i18n.getString( 'edit_profile' )"><img src="../icons/profile_edit.png" alt="$i18n.getString( 'edit_profile' )"/></a>
-</h3>
+<h3>$i18n.getString( "user_account" )</h3>
 
 <form id="updateUserinforForm" action="updateUserAccount.action" method="post" onsubmit='return false;'>
 <div>
@@ -47,8 +45,7 @@
     </tr>
 	<tr>
 		<td></td>
-		<td valign="top"><input type="submit" value="$i18n.getString( 'save' )" style="width:10em">
-		<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='$!backUrl'" style="width:120px"/></td>
+		<td valign="top"><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"></td>
 	</tr>
 </table>
 </form>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm	2012-10-07 20:10:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserProfileForm.vm	2012-10-11 14:21:08 +0000
@@ -59,7 +59,7 @@
     </tr>
 	<tr>
 		<td></td>
-		<td valign="top"><input type="submit" value="$i18n.getString( 'update' )" style="width:10em"/></td>
+		<td valign="top"><input type="submit" value="$i18n.getString( 'save' )" style="width:10em"/></td>
 	</tr>
 </table>
 </form>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2012-10-08 07:10:08 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2012-10-11 14:21:08 +0000
@@ -25,88 +25,75 @@
 	var currentPath = '../dhis-web-commons-about/';
 	var backURL = '?backUrl=' + window.location;
 
-	$( "#menuDropDownUserSettings" ).click( function()
-		{
-			window.location.href = currentPath + 'userGeneralSettings.action' + backURL;
-		});
-	
 	$( "#menuDropDownHelpCenter" ).click( function()
 		{
-			window.location.href = currentPath + 'help.action' + backURL;
+			window.location.href = currentPath + "help.action" + backURL;
 		});
 
 	$( "#menuDropDownChangeLog" ).click( function()
 		{
-			window.location.href = currentPath + 'displayChangeLog.action' + backURL;
+			window.location.href = currentPath + "displayChangeLog.action" + backURL;
 		} );
 		
 	$( "#menuDropDownSupportiveSoftware" ).click( function()
 		{
-			window.location.href= currentPath + 'displaySupportiveSoftware.action' + backURL;
+			window.location.href= currentPath + "displaySupportiveSoftware.action" + backURL;
 		} );
 	
-	$( "#menuDropDownUserAccount" ).click( function()
-		{
-			window.location.href = currentPath + 'showUpdateUserAccountForm.action' + backURL;
-		} );
-		
 	$( "#menuDropDownModuleOverview" ).click( function()
 		{
-			window.location.href = currentPath + 'modules.action' + backURL;
+			window.location.href = currentPath + "modules.action" + backURL;
 		} );
 		
 	$( "#menuDropDownWebApi" ).click( function()
 		{
-			window.location.href = '../api';
+			window.location.href = "../api";
 		} );
 		
 	$( "#menuDropDownAboutDHIS2" ).click( function()
 		{
-			window.location.href = currentPath + 'about.action' + backURL;
+			window.location.href = currentPath + "about.action" + backURL;
 		} );
 	
 	// Set show and hide drop down events on top menu
 	
-	if ( maintenanceModulesNo > 0 )
-	{
-		$( "#menuLink1" ).hover( function() 
-		{
-			showDropDown( 'menuDropDown1' );
-		}, 
-		function() 
-		{
-			hideDropDownTimeout();
-		} );
-	}
+	$( "#menuLink1" ).hover( function() 
+	{
+		showDropDown( "menuDropDown1" );
+	}, 
+	function() 
+	{
+		hideDropDownTimeout();
+	} );
 
-	if ( serviceModulesNo > 0 )
-	{
-		$( "#menuLink2" ).hover( function() 
-		{
-			showDropDown( 'menuDropDown2' );
-		}, 
-		function() 
-		{
-			hideDropDownTimeout();
-		} );
-	}
+	$( "#menuLink2" ).hover( function() 
+	{
+		showDropDown( "menuDropDown2" );
+	}, 
+	function() 
+	{
+		hideDropDownTimeout();
+	} );
 
 	$( "#menuLink3" ).hover( function() 
 	{
-		showDropDown( 'menuDropDown3' );
-	}, 
-	function() 
-	{
-		hideDropDownTimeout();
-	} );
-
-	$( "#menuLink4" ).click( function() 
-	{
-		jQuery.cookie( 'pageSize', null, {path:'/'} );
-		window.location.href='../dhis-web-commons-security/logout.action';
-	} );
-
-	$( "#menuDropDown1, #menuDropDown2, #menuDropDown3" ).hover( function() 
+		showDropDown( "menuDropDown3" );
+	}, 
+	function() 
+	{
+		hideDropDownTimeout();
+	} );
+
+	$( "#menuLink4" ).hover( function() 
+	{
+		showDropDown( "menuDropDown4" );
+	}, 
+	function() 
+	{
+		hideDropDownTimeout();
+	} );
+
+	$( "#menuDropDown1, #menuDropDown2, #menuDropDown3, #menuDropDown4" ).hover( function() 
 	{
 		cancelHideDropDownTimeout();
 	}, 

=== 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-08 15:50:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm	2012-10-11 14:21:08 +0000
@@ -13,8 +13,6 @@
 
     <script type="text/javascript">
       var dateFormat = 'yy-mm-dd';
-      var maintenanceModulesNo = ${maintenanceModules.size()};
-      var serviceModulesNo = ${serviceModules.size()};
     </script>
 
     <script type="text/javascript" src="../dhis-web-commons/javascripts/jQuery/jquery.min.js"></script>
@@ -76,15 +74,13 @@
       <div id="menuLink2" class="menuLink">$i18n.getString( "services" )</div>
       #end
       <div id="menuLink3" class="menuLink">$i18n.getString( "help" )</div>
-      <div id="menuLink4" class="menuLink">$i18n.getString( "log_out" )</div>
+      <div id="menuLink4" class="menuLink">$i18n.getString( "profile" )</div>
 
       #if( $maintenanceModules.size() > 0 )
       <div id="menuDropDown1" class="menuDropDownArea" >
       <ul class="menuDropDownBox">
       #foreach( $module in $maintenanceModules )
-        <li>
-          <a href="${module.defaultAction}">$i18n.getString( $module.name )&nbsp;</a>
-        </li>
+        <li><a href="${module.defaultAction}">$i18n.getString( $module.name )&nbsp;</a></li>
       #end
       </ul>      
       </div>
@@ -94,27 +90,32 @@
       <div id="menuDropDown2" class="menuDropDownArea">
       <ul class="menuDropDownBox">
       #foreach( $module in $serviceModules )
-        <li>
-          <a href="${module.defaultAction}">$i18n.getString( $module.name )&nbsp;</a>
-        </li>
+        <li><a href="${module.defaultAction}">$i18n.getString( $module.name )&nbsp;</a></li>
       #end
       </ul>      
       </div>
       #end
 	  
       <div id="menuDropDown3" class="menuDropDownArea">
-      <ul class="menuDropDownBox">
-        <li><a id="menuDropDownUserSettings">$i18n.getString( "settings" )&nbsp;</a></li>
+      <ul class="menuDropDownBox">        
         <li><a id="menuDropDownHelpCenter">$i18n.getString( "help_center" )&nbsp;</a></li>
         <li><a id="menuDropDownChangeLog">$i18n.getString( "change_log" )&nbsp;</a></li>
-        <li><a id="menuDropDownSupportiveSoftware">$i18n.getString( "supportive_software" )&nbsp;</a></li>
-        <li><a id="menuDropDownUserAccount">$i18n.getString( "user_account" )&nbsp;</a></li>
+        <li><a id="menuDropDownSupportiveSoftware">$i18n.getString( "supportive_software" )&nbsp;</a></li>        
         <li><a id="menuDropDownModuleOverview">$i18n.getString( "system_overview" )&nbsp;</a></li>
         <li><a id="menuDropDownWebApi">$i18n.getString( "web_api" )&nbsp;</a></li>
         <li><a id="menuDropDownAboutDHIS2">$i18n.getString( "about_dhis2" )&nbsp;</a></li>
       </ul>
       </div>
 	  
+	  <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>
+      </ul>
+	  </div>
+	  
       <span id="headerText" onclick="window.location.href='../${startModule}/index.action'" style="cursor:pointer" title="$i18n.getString( 'view_home_page' )">
         #if ( $applicationTitle )
           $encoder.htmlEncode( $applicationTitle )

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/GetCurrentUserAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/GetCurrentUserAction.java	2012-10-07 20:10:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/GetCurrentUserAction.java	2012-10-11 14:21:08 +0000
@@ -35,9 +35,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $Id$
- * @modifier Dang Duy Hieu
- * @since 2010-05-04
  */
 public class GetCurrentUserAction
     implements Action
@@ -54,8 +51,6 @@
 
     private UserCredentials userCredentials;
 
-    private String backUrl;
-
     // -------------------------------------------------------------------------
     // Getters && Setters
     // -------------------------------------------------------------------------
@@ -70,16 +65,6 @@
         return userCredentials;
     }
 
-    public String getBackUrl()
-    {
-        return backUrl;
-    }
-
-    public void setBackUrl( String backUrl )
-    {
-        this.backUrl = backUrl;
-    }
-
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------

=== 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-08 15:50:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2012-10-11 14:21:08 +0000
@@ -329,6 +329,12 @@
 message_sms_notification=Message sms notification
 intro_user_general_settings=Customize the system with user specific settings for locale, style and more.
 intro_user_message_settings=Customize the system with user specific settings for message email and sms notification.
+light_blue=Light Blue
+green=Green
+india=India
+vietnam=Vietnam
+settings_updated=Settings were updated
+
 #-- Change Log------------------------------------------------------------------#
 
 change_log=Change Log
@@ -356,6 +362,8 @@
 
 #-- User account --------------------------------------------------------------#
 
+profile=Profile
+account=Account
 update_user=Update user
 user_account=User Account
 user_name=User name

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2012-10-11 11:56:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2012-10-11 14:21:08 +0000
@@ -10,8 +10,6 @@
 password=Password
 application_title=Application title
 dhis-web-maintenance-settings=Settings
-light_blue=Light Blue
-green=Green
 flag=Flag
 no_flag=No flag
 ethiopia=Ethiopia
@@ -82,7 +80,6 @@
 infrastructural_period_type=Infrastructural period type
 feedback_recipients=Feedback recipients
 no_feedback_recipients=No message recipients
-settings_updated=Settings were updated
 completeness_recipients=Completeness notification recipients
 no_completeness_recipients=No completeness recipients
 system_overview=System overview