diff --git a/client/routes/router.coffee b/client/routes/router.coffee
index f7112b4ddd9..787d3c18feb 100644
--- a/client/routes/router.coffee
+++ b/client/routes/router.coffee
@@ -52,7 +52,7 @@ FlowRouter.route '/usersettings/:group?',
 		unless params.group
 			params.group = 'Profile'
 		params.group = _.capitalize params.group, true
-		BlazeLayout.render 'main', { center: 'userSettings', settings: "userSettings#{params.group}" }
+		BlazeLayout.render 'main', { center: "userSettings#{params.group}" }
 
 FlowRouter.route '/history/private',
 	name: 'privateHistory'
diff --git a/client/views/app/sideNav/userStatus.html b/client/views/app/sideNav/userStatus.html
index 2b1e11672cb..6f11241ee90 100644
--- a/client/views/app/sideNav/userStatus.html
+++ b/client/views/app/sideNav/userStatus.html
@@ -17,7 +17,7 @@
 					<a href="" data-status="away" class="status away"><span>{{_ "Away" context="male"}}</span></a>
 					<a href="" data-status="busy" class="status busy"><span>{{_ "Busy" context="male"}}</span></a>
 					<a href="" data-status="offline" class="status offline"><span>{{_ "Invisible"}}</span></a>
-					<a href="" id="settings"><i class="icon-sliders"></i><span>{{_ "Settings"}}</span></a>
+					<a href="" id="settings"><i class="icon-sliders"></i><span>{{_ "My_Account"}}</span></a>
 					<a href="" id="logout"><i class="icon-logout"></i><span>{{_ "Logout"}}</span></a>
 				</div>
 			</nav>
diff --git a/client/views/usersettings/userSettings.coffee b/client/views/usersettings/userSettings.coffee
index cd4b680a162..3e2d0289b6c 100644
--- a/client/views/usersettings/userSettings.coffee
+++ b/client/views/usersettings/userSettings.coffee
@@ -9,9 +9,3 @@ Template.userSettings.onRendered ->
 	Tracker.afterFlush ->
 		SideNav.setFlex "userSettingsFlex"
 		SideNav.openFlex()
-
-Template.userSettings.events
-	'click .submit button': (e, t) ->
-		if t.child?.length > 0
-			for child in t.child
-				child.save?()
\ No newline at end of file
diff --git a/client/views/usersettings/userSettings.html b/client/views/usersettings/userSettings.html
index 4d091461dbc..664bd583485 100644
--- a/client/views/usersettings/userSettings.html
+++ b/client/views/usersettings/userSettings.html
@@ -6,17 +6,5 @@
 				<span class="room-title">{{_ "User_Settings"}}</span>
 			</h2>
 		</head>
-		<div class="content">
-			<div class="info">
-				<h3>{{label}}</h3>
-				<h3>{{description}}</h3>
-			</div>
-			<div class="rocket-form">
-				{{> Template.dynamic template=settings}}
-				<div class="submit">
-					<button class="button"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
-				</div>
-			</div>
-		</div>
 	</section>
 </template>
\ No newline at end of file
diff --git a/client/views/usersettings/userSettingsFlex.html b/client/views/usersettings/userSettingsFlex.html
index 5526c757577..6f3727de177 100644
--- a/client/views/usersettings/userSettingsFlex.html
+++ b/client/views/usersettings/userSettingsFlex.html
@@ -1,7 +1,7 @@
 <template name="userSettingsFlex">
 	<header>
 		<div>
-			<h4>{{_ "User_Settings"}}</h4>
+			<h4>{{_ "My_Account"}}</h4>
 		</div>
 	</header>
 	<div class="content">
@@ -9,7 +9,9 @@
 			<ul>
 				<li>
 					<a href="{{pathFor 'userSettings' group='profile'}}">{{_ "Profile"}}</a>
-					<a href="{{pathFor 'changeAvatar'}}">{{_ "Change_avatar"}}</a>
+					{{!-- <a href="{{pathFor 'userSettings' group='account'}}">{{_ "Account_Settings"}}</a> --}}
+					{{!-- <a href="{{pathFor 'userSettings' group='notification'}}">{{_ "Notification"}}</a> --}}
+					<a href="{{pathFor 'changeAvatar'}}">{{_ "Change_avatar"}}</a> {{!-- move this to profile --}}
 				</li>
 			</ul>
 		</div>
diff --git a/client/views/usersettings/userSettingsProfile.coffee b/client/views/usersettings/userSettingsProfile.coffee
index 6d68a530326..5ba835d5f79 100644
--- a/client/views/usersettings/userSettingsProfile.coffee
+++ b/client/views/usersettings/userSettingsProfile.coffee
@@ -1,4 +1,9 @@
 Template.userSettingsProfile.helpers
+	flexOpened: ->
+		return 'opened' if Session.equals('flexOpened', true)
+	arrowPosition: ->
+		console.log 'room.helpers arrowPosition' if window.rocketDebug
+		return 'left' unless Session.equals('flexOpened', true)
 	languages: ->
 		languages = TAPi18n.getLanguages()
 		result = []
@@ -32,9 +37,6 @@ Template.userSettingsProfile.onCreated ->
 		if _.trim $('#password').val()
 			data.password = _.trim $('#password').val()
 
-		if $('#showUTCTime:checked').length
-			data.showUTCTime = true
-
 		Meteor.call 'saveUserProfile', data, (error, results) ->
 			if results 
 				toastr.success t('Profile_saved_successfully')
@@ -46,3 +48,12 @@ Template.userSettingsProfile.onCreated ->
 
 			if error
 				toastr.error error.reason
+
+Template.userSettingsProfile.onRendered ->
+	Tracker.afterFlush ->
+		SideNav.setFlex "userSettingsFlex"
+		SideNav.openFlex()
+
+Template.userSettingsProfile.events
+	'click .submit button': (e, t) ->
+		t.save()
\ No newline at end of file
diff --git a/client/views/usersettings/userSettingsProfile.html b/client/views/usersettings/userSettingsProfile.html
index 14a37b0af7d..5c661cf5745 100644
--- a/client/views/usersettings/userSettingsProfile.html
+++ b/client/views/usersettings/userSettingsProfile.html
@@ -1,28 +1,35 @@
 <template name="userSettingsProfile">
-	<fieldset>
-		<div class="input-line">
-			<label for="language">{{_ "Language"}}</label>
-			<div>
-				<select id="language" class="required">
-					{{#each languages}}
-					<option value="{{key}}" selected="{{userLanguage key}}" dir="auto">{{name}}</option>
-					{{/each}}
-				</select>
-			</div>
-		</div>
-		<div class="input-line">
-			<label for="password">{{_ "Password"}}</label>
-			<div>
-				<input type="password" name="password" id="password" />
-			</div>
-		</div>
-		<div class="input-line">
-			<div class="input-line">
-				<label for="showUTC"></label>
-				<div>
-					<label><input type="checkbox" name="showUTC" id="showUTC" value="1" /> {{_ "Show_UTC"}}</label>
+	<section class="page-container page-home page-static">
+		<head class="fixed-title">
+			{{> burger}}
+			<h2>
+				<span class="room-title">{{_ "Profile"}}</span>
+			</h2>
+		</head>
+		<div class="content">
+			<div class="rocket-form">
+				<fieldset>
+					<div class="input-line">
+						<label for="language">{{_ "Language"}}</label>
+						<div>
+							<select id="language" class="required">
+								{{#each languages}}
+								<option value="{{key}}" selected="{{userLanguage key}}" dir="auto">{{name}}</option>
+								{{/each}}
+							</select>
+						</div>
+					</div>
+					<div class="input-line">
+						<label for="password">{{_ "Password"}}</label>
+						<div>
+							<input type="password" name="password" id="password" />
+						</div>
+					</div>
+				</fieldset>
+				<div class="submit">
+					<button class="button"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
 				</div>
 			</div>
 		</div>
-	</fieldset>
+	</section>
 </template>
\ No newline at end of file
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 49adf06335c..98f23397509 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -93,6 +93,7 @@
   "More_channels" : "More channels",
   "Msgs" : "Msgs",
   "multi" : "multi",
+  "My_Account" : "My Account",
   "n_messages" : "%s messages",
   "Name" : "Name",
   "New_messages" : "New messages",
diff --git a/server/methods/saveUserProfile.coffee b/server/methods/saveUserProfile.coffee
index 6e853b0f2fc..d64c2706090 100644
--- a/server/methods/saveUserProfile.coffee
+++ b/server/methods/saveUserProfile.coffee
@@ -8,8 +8,7 @@ Meteor.methods
 				Accounts.setPassword Meteor.userId(), settings.password, { logout: false }
 
 			profile = {}
-			profile.showUTCTime = !! settings.showUTCTime
-
+			
 			Meteor.users.update Meteor.userId(), { $set: { "settings.profile": profile } }
 
 			return true
\ No newline at end of file