diff --git a/app/templates/mod/panel.html b/app/templates/mod/panel.html
index ff71139..1fa6d93 100644
--- a/app/templates/mod/panel.html
+++ b/app/templates/mod/panel.html
@@ -1,6 +1,6 @@
 {%- from 'common/macros.html' import subheader, babycode_editor_component, sortable_list, sortable_list_item -%}
 {%- extends 'base.html' -%}
-{%- block title -%}settings{%- endblock -%}
+{%- block title -%}moderation panel{%- endblock -%}
 {%- block content -%}
 {{- subheader('Moderation panel') -}}
 <fieldset class="plank">
diff --git a/app/templates/threads/new_thread.html b/app/templates/threads/new_thread.html
index 80079d0..cc65f25 100644
--- a/app/templates/threads/new_thread.html
+++ b/app/templates/threads/new_thread.html
@@ -6,7 +6,7 @@
 <form class="plank primary-bg full-width" method="POST">
   <label for="topic">Topic</label>
   <select name="topic_id" id="topic" autocomplete="off">
-    {%- for topic in topics -%}
+    {%- for topic in topics | sort(attribute='sort_order') -%}
     <option value="{{topic.id}}" {{'selected' if selected_topic == topic.id else ''}} {{'disabled' if not get_active_user().can_post_to_thread_or_topic(topic) else ''}}>{{topic.name}}{{ ' (locked)' if topic.locked() else ''}}</option>
     {%- endfor -%}
   </select>
diff --git a/app/templates/users/user_page.html b/app/templates/users/user_page.html
index e864e64..a396fb6 100644
--- a/app/templates/users/user_page.html
+++ b/app/templates/users/user_page.html
@@ -1,6 +1,6 @@
 {%- from 'common/macros.html' import subheader, timestamp, pager, avatar -%}
 {%- extends 'base.html' -%}
-{%- block title -%}{{ target_user.get_readable_name() }}'s profile{%- endblock -%}
+{%- block title -%}@{{ target_user.username }}{%- endblock -%}
 {%- set stats = target_user.get_post_stats() -%}
 {%- block content -%}
 {%- call() subheader("%s's profile" % target_user.get_readable_name()) -%}
@@ -45,7 +45,7 @@
     </div>
   </div>
   <div class="plank even minimal no-shadow user-stats">
-    <h3 class="info">{{target_user.get_readable_name()}}</h3>
+    <h3 class="info">{{target_user.get_readable_name()}} (@{{target_user.username}})</h3>
     <span>Display name: {{target_user.get_readable_name()}}</span>
     <span>Mention: @{{target_user.username}}</span>
     <span>Status: <em>{{target_user.status}}</em></span>