diff --git a/yadc/bp/user.py b/yadc/bp/user.py
index 66d37ac..4bc20a9 100644
--- a/yadc/bp/user.py
+++ b/yadc/bp/user.py
@@ -35,7 +35,7 @@ def settings():
 def change_info():
     form = ChangeUserInfoForm(request.form)
     if form.validate():
-        current_user.biography = form.bio.data
+        current_user.biography = form.bio.data.strip()
 
         db.session.commit()
         flash('Your biography was updated.')
diff --git a/yadc/templates/auth/login.html b/yadc/templates/auth/login.html
index 092d3a8..6167859 100644
--- a/yadc/templates/auth/login.html
+++ b/yadc/templates/auth/login.html
@@ -13,10 +13,12 @@
         {{ form.password(placeholder="Password") }}
         {{ errors(form.password) }}
 
-        <div class="row">
-            {{ form.remember_me() }} {{ form.remember_me.label }}
-            {{ errors(form.remember_me) }}
-        </div>
+        <ul>
+            <li>
+                {{ form.remember_me() }}{{ form.remember_me.label }}
+            </li>
+        </ul>
+        {{ errors(form.remember_me) }}
         <div class="row stretch">
             {{ form.submit() }}
             <a href="{{ url_for('auth.reset_password') }}">Forgotten password?</a>
diff --git a/yadc/templates/user/settings.html b/yadc/templates/user/settings.html
index ba61d01..7d7663d 100644
--- a/yadc/templates/user/settings.html
+++ b/yadc/templates/user/settings.html
@@ -60,14 +60,16 @@
         <h3>Delete user data</h3>
         <form action="{{ url_for('user.delete_data') }}" method="post">
             {{ delete_form.csrf_token }}
-
-            {{ delete_form.all_comments() }}{{ delete_form.all_comments.label }}
-            {{ errors(delete_form.all_posts) }}
-
-            <div>
-                {{ delete_form.all_posts() }}{{ delete_form.all_posts.label }}
-                {{ errors(delete_form.all_posts) }}
-            </div>
+            <ul>
+                <li>
+                    {{ delete_form.all_comments() }}{{ delete_form.all_comments.label }}
+                    {{ errors(delete_form.all_comments) }}
+                </li>
+                <li>
+                    {{ delete_form.all_posts() }}{{ delete_form.all_posts.label }}
+                    {{ errors(delete_form.all_posts) }}
+                </li>
+            </ul>
 
             {{ delete_form.delete_submit() }}
         </form>