diff --git a/cps/templates/languages.html b/cps/templates/languages.html
index ce1ba359..eba7af04 100644
--- a/cps/templates/languages.html
+++ b/cps/templates/languages.html
@@ -2,11 +2,17 @@
 {% block body %}
   <h1>{{title}}</h1>
   <div class="container">
+       <div class="col-sm-6">
   {% for lang in languages %}
+      {% if loop.index0 == (loop.length/2)|int and loop.length > 20 %}
+       </div>
+       <div class="col-sm-6">
+    {% endif %}
     <div class="row">
         <div class="col-xs-1" align="left"><span class="badge">{{lang_counter[loop.index0].bookcount}}</span></div>
         <div class="col-xs-6"><a id="list_{{loop.index0}}" href="{{url_for('language', name=lang.lang_code)}}">{{lang.name}}</a></div>
     </div>
   {% endfor %}
-</div>
+  </div>
+  </div>
 {% endblock %}
diff --git a/cps/templates/list.html b/cps/templates/list.html
index d424d495..0a63b139 100644
--- a/cps/templates/list.html
+++ b/cps/templates/list.html
@@ -2,11 +2,17 @@
 {% block body %}
 <h1>{{title}}</h1>
   <div class="container">
+    <div class="col-sm-6">
     {% for entry in entries %}
+      {% if loop.index0 == (loop.length/2)|int and loop.length > 20 %}
+        </div>
+        <div class="col-sm-6">
+      {% endif %}
       <div class="row">
         <div class="col-xs-1" align="left"><span class="badge">{{entry.count}}</span></div>
         <div class="col-xs-6"><a id="list_{{loop.index0}}" href="{{url_for(folder, id=entry[0].id )}}">{{entry[0].name}}</a></div>
       </div>
     {% endfor %}
   </div>
+  </div>
 {% endblock %}
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index b9cff3eb..02bf31d6 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -40,6 +40,8 @@
             {% endfor %}
         </select>
     </div>
+      <div class="col-sm-6">
+
     <div class="form-group">
         <input type="checkbox" name="show_random" id="show_random" {% if content.show_random_books() %}checked{% endif %}>
         <label for="show_random">{{_('Show random books')}}</label>
@@ -72,7 +74,8 @@
         <input type="checkbox" name="show_detail_random" id="show_detail_random" {% if content.show_detail_random() %}checked{% endif %}>
         <label for="show_detail_random">{{_('Show random books in detail view')}}</label>
     </div>
-
+</div>
+      <div class="col-sm-6">
     {% if g.user and g.user.role_admin() and not profile %}
     {% if not content.role_anonymous() %}
     <div class="form-group">
@@ -106,10 +109,15 @@
         </label>
       </div>
     {% endif %}
+    </div>
+      <div class="col-sm-12">
     <button type="submit" id="submit" class="btn btn-default">{{_('Submit')}}</button>
     {% if not profile %}
       <a href="{{ url_for('admin') }}" id="back" class="btn btn-default">{{_('Back')}}</a>
+    </div>
     {% endif %}
+
+
   </form>
 
   {% if downloads %}