diff --git a/view/templates/settings-head.tpl b/view/templates/settings-head.tpl
index b150c232ce..536ebd2f44 100644
--- a/view/templates/settings-head.tpl
+++ b/view/templates/settings-head.tpl
@@ -19,6 +19,12 @@
 			}
 
 		}).trigger('change');
+		
+		$('.settings-block').hide();
+		$('.settings-heading').click(function(){
+			$('.settings-block').hide();
+			$(this).next('.settings-block').toggle();
+		});
 
 	});
 
diff --git a/view/templates/settings.tpl b/view/templates/settings.tpl
index 5a964ae7a3..ed92e10110 100644
--- a/view/templates/settings.tpl
+++ b/view/templates/settings.tpl
@@ -6,7 +6,7 @@
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 <h3 class="settings-heading">{{$h_pass}}</h3>
-
+<div class="settings-block">
 {{include file="field_password.tpl" field=$password1}}
 {{include file="field_password.tpl" field=$password2}}
 {{include file="field_password.tpl" field=$password3}}
@@ -18,9 +18,10 @@
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
-
+</div>
 
 <h3 class="settings-heading">{{$h_basic}}</h3>
+<div class="settings-block">
 
 {{include file="field_input.tpl" field=$username}}
 {{include file="field_input.tpl" field=$email}}
@@ -33,10 +34,11 @@
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
+</div>
 
 
 <h3 class="settings-heading">{{$h_prv}}</h3>
-
+<div class="settings-block">
 
 <input type="hidden" name="visibility" value="{{$visibility}}" />
 
@@ -102,10 +104,13 @@
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
+</div>
+
 
 
 
 <h3 class="settings-heading">{{$h_not}}</h3>
+<div class="settings-block">
 <div id="settings-notifications">
 
 <div id="settings-activity-desc">{{$activity_options}}</div>
@@ -133,9 +138,11 @@
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
+</div>
 
 
 <h3 class="settings-heading">{{$h_advn}}</h3>
+<div class="settings-block">
 <div id="settings-pagetype-desc">{{$h_descadvn}}</div>
 
 {{$pagetype}}
@@ -143,13 +150,16 @@
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
+</div>
 
 <h3 class="settings-heading">{{$relocate}}</h3>
+<div class="settings-block">
 <div id="settings-pagetype-desc">{{$relocate_text}}</div>
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button}}" />
 </div>
+</div>
 
 
 
diff --git a/view/templates/settings_features.tpl b/view/templates/settings_features.tpl
index e169d46c41..6218dfbd4f 100644
--- a/view/templates/settings_features.tpl
+++ b/view/templates/settings_features.tpl
@@ -7,15 +7,16 @@
 
 {{foreach $features as $f}}
 <h3 class="settings-heading">{{$f.0}}</h3>
+<div class="settings-block">
 
 {{foreach $f.1 as $fcat}}
 	{{include file="field_yesno.tpl" field=$fcat}}
 {{/foreach}}
-{{/foreach}}
-
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
 </div>
+</div>
+{{/foreach}}
 
 </form>
 
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index c64f70bc60..e716766492 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -2728,3 +2728,6 @@ a.mail-list-link {
         border: none;
 }
 
+.settings-heading {
+	cursor: pointer;
+}