diff --git a/resources/templates/adduser.tmpl b/resources/templates/adduser.tmpl
index 925f148..4c897e0 100644
--- a/resources/templates/adduser.tmpl
+++ b/resources/templates/adduser.tmpl
@@ -6,7 +6,7 @@
         <div class="col-md-12 column">
             <div class="well well-sm">
               <form method='POST' action='/adduser' role="form" class="form-signin" data-toggle="validator">
-              <h2 class="h3">Fill user attributes:</h2>
+              <h2 class="h3">Fill new user attributes:</h2>
               ${form}
               <h2 class="h3">Enable/Disable roles:</h2>
               ${roles}
diff --git a/resources/templates/form.tmpl b/resources/templates/form.tmpl
index 19ffd86..3f117a1 100644
--- a/resources/templates/form.tmpl
+++ b/resources/templates/form.tmpl
@@ -1,10 +1,20 @@
 <% 
-len_second_column = len(attributes) / 2
-counter = -1
+len_attr = len(attributes)
+switch = len_attr / 2
+if not switch * 2 == len_attr:
+    switch = switch + 1
+counter = 1
+lc1 = []
+lc2 = []
+for a in sorted(attributes.keys(), key=lambda attr: attributes[attr]['weight']):
+    if counter <= switch:
+        lc1.append(a)
+    else:
+        lc2.append(a)
+    counter = counter + 1
 %>
-<div class="row">
-<div class="col-md-6 column">
-% for a in sorted(attributes.keys(), key=lambda attr: attributes[attr]['weight']):
+<%def name="form_col(l)">
+% for a in l: 
 <% attr = attributes[a] %>
 <div class="form-group">
 <div class="input-group">
@@ -16,7 +26,6 @@ counter = -1
         value = ''
         value2 = ''
   %>
-  <% counter = counter + 1 %>
   <span class="input-group-addon" id="basic-addon1">${attr['display_name']}</span>
     % if attr['type'] == 'string':
   <input type="text"   name="${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" required ${value}>
@@ -41,10 +50,13 @@ counter = -1
     % endif
 </div>
 </div>
-% if counter == len_second_column:
+% endfor
+</%def>
+<div class="row">
+<div class="col-md-6 column">
+${form_col(lc1)}
 </div>
 <div class="col-md-6 column">
-% endif
-% endfor
+${form_col(lc2)}
 </div>
 </div>
diff --git a/resources/templates/selfmodify.tmpl b/resources/templates/selfmodify.tmpl
index bd1ac0c..28e4ac2 100644
--- a/resources/templates/selfmodify.tmpl
+++ b/resources/templates/selfmodify.tmpl
@@ -3,9 +3,10 @@
     <div class="row clearfix top-buffer bottom-buffer">
         <div class="col-md-2 column">
         </div>
-        <div class="col-md-8 column">
+        <div class="col-md-12 column">
             <div class="well well-sm">
               <form method='POST' action='/selfmodify' role="form" class="form-signin" data-toggle="validator">
+              <h2 class="h3">Modify your attributes:</h2>
               ${form}
               <div class="form-group">
                 <div class="input-group">