diff --git a/templates/user/form.html.twig b/templates/user/form.html.twig
index 234c3c02..05b4f03c 100644
--- a/templates/user/form.html.twig
+++ b/templates/user/form.html.twig
@@ -41,104 +41,101 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'profile' ? url('user_profile_submit') : (mode == 'update' ? url('user_update_submit', {'id': obj.getId()}) : url('user_create_submit')) }}">
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right" method="post" action="{{ mode == 'profile' ? url('user_profile_submit') : (mode == 'update' ? url('user_update_submit', {'id': obj.getId()}) : url('user_create_submit')) }}">
 
 						<div class="m-portlet__body">
-							<div class="form-group m-form__group row no-border">
-								<label class="col-lg-2 col-form-label" data-field="username">
-									Username:
-								</label>
-								<div class="col-lg-4">
-									<input type="text" name="username" class="form-control m-input" value="{{ obj.getUsername() }}"{{ mode == 'profile' ? ' disabled' }}>
-									<div class="form-control-feedback hide" data-field="username"></div>
-									<span class="m-form__help">Unique alias for this user</span>
+							<div class="m-form__section m-form__section--first{{ mode == 'profile' ? ' m-form__section--last' }}">
+								<div class="m-form__heading">
+									<h3 class="m-form__heading-title">
+										User Info
+									</h3>
 								</div>
-							</div>
-							<div class="form-group m-form__group row">
-								<label class="col-lg-2 col-form-label" data-field="password">
-									Password:
-								</label>
-								<div class="col-lg-4">
-									<input type="password" name="password" class="form-control m-input">
-									<div class="form-control-feedback hide" data-field="password"></div>
-									{% if obj is defined %}
-										<span class="m-form__help">Leave both fields blank for unchanged</span>
-									{% endif %}
-								</div>
-								<label class="col-lg-2 col-form-label" data-field="confirm_password">
-									Confirm Password:
-								</label>
-								<div class="col-lg-4">
-									<input type="password" name="confirm_password" class="form-control m-input">
-									<div class="form-control-feedback hide" data-field="confirm_password"></div>
-								</div>
-							</div>
-							<div class="form-group m-form__group row no-border">
-								<label class="col-lg-2 col-form-label" data-field="first_name">
-									First Name:
-								</label>
-								<div class="col-lg-4">
-									<input type="text" name="first_name" class="form-control m-input" value="{{ obj.getFirstName() }}">
-									<div class="form-control-feedback hide" data-field="first_name"></div>
-								</div>
-								<label class="col-lg-2 col-form-label" data-field="last_name">
-									Last Name:
-								</label>
-								<div class="col-lg-4">
-									<input type="text" name="last_name" class="form-control m-input" value="{{ obj.getLastName() }}">
-									<div class="form-control-feedback hide" data-field="last_name"></div>
-								</div>
-							</div>
-							<div class="form-group m-form__group row">
-								<label class="col-lg-2 col-form-label" data-field="email">
-									E-mail Address:
-								</label>
-								<div class="col-lg-4">
-									<input type="email" name="email" class="form-control m-input" value="{{ obj.getEmail() }}">
-									<div class="form-control-feedback hide" data-field="email"></div>
-								</div>
-								<label class="col-lg-2 col-form-label" data-field="contact_no">
-									Contact Number:
-								</label>
-								<div class="col-lg-4">
-									<input type="text" name="contact_no" class="form-control m-input" value="{{ obj.getContactNumber() }}">
-									<div class="form-control-feedback hide" data-field="contact_no"></div>
-								</div>
-							</div>
-							{% if mode != 'profile' %}
-								<div class="form-group m-form__group row">
-									<label class="col-lg-2 col-form-label" data-field="roles">
-										Roles:
-									</label>
-									<div class="col-lg-10">
-										<div class="m-checkbox-list">
-											{% for role in roles %}
-	                                        {% if role.isSuperAdmin and not is_granted('user.role.sadmin') %}
-	                                        {% else %}
-											<label class="m-checkbox">
-												<input type="checkbox" name="roles[]" value="{{ role.getID() }}"{{ role.getID() in obj.getRoles() ? ' checked' : '' }}>
-												{{ role.getName() }}
-												<span></span>
-											</label>
-	                                        {% endif %}
-											{% endfor %}
-										</div>
-										<div class="form-control-feedback hide" data-field="roles"></div>
-										<span class="m-form__help">Check all roles that apply</span>
+								<div class="form-group m-form__group row no-border">
+									<div class="col-lg-6">
+										<label for="username" data-field="username">Username</label>
+										<input type="text" name="username" class="form-control m-input" value="{{ obj.getUsername() }}"{{ mode == 'profile' ? ' disabled' }}>
+										<div class="form-control-feedback hide" data-field="username"></div>
+										<span class="m-form__help">Unique alias for this user</span>
 									</div>
 								</div>
 								<div class="form-group m-form__group row">
-									<label class="col-lg-2 col-form-label" data-field="enabled">
-										Enabled:
-									</label>
-									<div class="col-lg-10">
-										<span class="m-switch m-switch--icon">
-											<label>
-												<input type="checkbox" name="enabled" value="1"{{ obj.isEnabled() ? ' checked' }}>
-												<span></span>
-											</label>
-										</span>
-										<div class="form-control-feedback hide" data-field="enabled"></div>
+									<div class="col-lg-6">
+										<label for="password" data-field="password">Password</label>
+										<input type="password" name="password" class="form-control m-input">
+										<div class="form-control-feedback hide" data-field="password"></div>
+										{% if obj is defined %}
+											<span class="m-form__help">Leave both fields blank for unchanged</span>
+										{% endif %}
+									</div>
+									<div class="col-lg-6">
+										<label for="confirm_password" data-field="confirm_password">Confirm Password</label>
+										<input type="password" name="confirm_password" class="form-control m-input">
+										<div class="form-control-feedback hide" data-field="confirm_password"></div>
+									</div>
+								</div>
+								<div class="form-group m-form__group row no-border">
+									<div class="col-lg-6">
+										<label for="first_name" data-field="first_name">First Name</label>
+										<input type="text" name="first_name" class="form-control m-input" value="{{ obj.getFirstName() }}">
+										<div class="form-control-feedback hide" data-field="first_name"></div>
+									</div>
+									<div class="col-lg-6">
+										<label for="last_name" data-field="last_name">Last Name</label>
+										<input type="text" name="last_name" class="form-control m-input" value="{{ obj.getLastName() }}">
+										<div class="form-control-feedback hide" data-field="last_name"></div>
+									</div>
+								</div>
+								<div class="form-group m-form__group row no-border">
+									<div class="col-lg-6">
+										<label for="email" data-field="email">E-mail Address</label>
+										<input type="email" name="email" class="form-control m-input" value="{{ obj.getEmail() }}">
+										<div class="form-control-feedback hide" data-field="email"></div>
+									</div>
+									<div class="col-lg-6">
+										<label for="contact_no" data-field="contact_no">Contact Number</label>
+										<input type="text" name="contact_no" class="form-control m-input" value="{{ obj.getContactNumber() }}">
+										<div class="form-control-feedback hide" data-field="contact_no"></div>
+									</div>
+								</div>
+								{% if mode != 'profile' %}
+									<div class="form-group m-form__group row no-border">
+										<div class="col-lg-12">
+											<span class="m-switch m-switch--icon block-switch">
+												<label>
+													<input type="checkbox" name="enabled" id="enabled" value="1"{{ obj.isEnabled() ? ' checked' }}>
+													<label class="switch-label">Enabled</label>
+													<span></span>
+												</label>
+											</span>
+											<div class="form-control-feedback hide" data-field="enabled"></div>
+										</div>
+									</div>
+								{% endif %}
+							</div>
+							{% if mode != 'profile' %}
+								<div class="m-form__section m-form__section--last">
+									<div class="m-form__heading">
+										<h3 class="m-form__heading-title">
+											Roles
+										</h3>
+									</div>
+									<div class="form-group m-form__group row">
+										<div class="col-lg-12">
+											<div class="m-checkbox-list">
+												{% for role in roles %}
+		                                        {% if role.isSuperAdmin and not is_granted('user.role.sadmin') %}
+		                                        {% else %}
+												<label class="m-checkbox">
+													<input type="checkbox" name="roles[]" value="{{ role.getID() }}"{{ role.getID() in obj.getRoles() ? ' checked' : '' }}>
+													{{ role.getName() }}
+													<span></span>
+												</label>
+		                                        {% endif %}
+												{% endfor %}
+											</div>
+											<div class="form-control-feedback hide" data-field="roles"></div>
+											<span class="m-form__help">Check all roles that apply</span>
+										</div>
 									</div>
 								</div>
 							{% endif %}