diff --git a/common/extend.go b/common/extend.go
index 4e3ce255..8c56931e 100644
--- a/common/extend.go
+++ b/common/extend.go
@@ -142,6 +142,7 @@ var PreRenderHooks = map[string][]func(http.ResponseWriter, *http.Request, *User
 	"pre_render_account_own_edit_mfa":       nil,
 	"pre_render_account_own_edit_mfa_setup": nil,
 	"pre_render_account_own_edit_email":     nil,
+	"pre_render_level_list":                 nil,
 	"pre_render_login":                      nil,
 	"pre_render_login_mfa_verify":           nil,
 	"pre_render_register":                   nil,
diff --git a/common/template_init.go b/common/template_init.go
index 07cda49e..eeb15d3c 100644
--- a/common/template_init.go
+++ b/common/template_init.go
@@ -508,7 +508,7 @@ func InitTemplates() error {
 			panic("phraseNameInt is not a string")
 		}
 		// TODO: Log non-existent phrases?
-		return GetTmplPhrase(phraseName)
+		return template.HTML(GetTmplPhrase(phraseName))
 	}
 
 	fmap["level"] = func(levelInt interface{}) interface{} {
@@ -516,7 +516,7 @@ func InitTemplates() error {
 		if !ok {
 			panic("levelInt is not an integer")
 		}
-		return GetLevelPhrase(level)
+		return template.HTML(GetLevelPhrase(level))
 	}
 
 	fmap["scope"] = func(name interface{}) interface{} {
diff --git a/langs/english.json b/langs/english.json
index ae9b7b27..3ee59979 100644
--- a/langs/english.json
+++ b/langs/english.json
@@ -448,6 +448,7 @@
 		"account_dash_2fa_setup":"Setup your two-factor authentication.",
 		"account_dash_2fa_manage":"Remove or manage your two-factor authentication.",
 		"account_dash_security_notice":"Security",
+		"account_username_save":"Save",
 		"account_avatar_select":"Select",
 		"account_avatar_update_button":"Upload",
 
diff --git a/templates/account_own_edit.html b/templates/account_own_edit.html
index 106cb60d..d819b6da 100644
--- a/templates/account_own_edit.html
+++ b/templates/account_own_edit.html
@@ -9,12 +9,12 @@
 				<span id="dash_username">
 					<form id="dash_username_form" action="/user/edit/username/submit/?session={{.CurrentUser.Session}}" method="post"></form>
 					<input form="dash_username_form" name="account-new-username" value="{{.CurrentUser.Name}}" />
-					<button form="dash_username_form" class="formbutton">Save</button>
+					<button form="dash_username_form" class="formbutton">{{lang "account_username_save"}}</button>
 				</span>
 				<img src="{{.CurrentUser.Avatar}}" height="128px" />
 				<span id="dash_avatar_buttons">
 					<input form="avatar_form" id="select_avatar" name="account-avatar" type="file" required style="display: none;" />
-					<label for="select_avatar" class="formbutton">Select</label>
+					<label for="select_avatar" class="formbutton">{{lang "account_avatar_select"}}</label>
 					<button form="avatar_form" name="account-button" class="formbutton">{{lang "account_avatar_update_button"}}</button>
 				</span>
 			</div>
diff --git a/templates/topic.html b/templates/topic.html
index 95654e75..6506ee42 100644
--- a/templates/topic.html
+++ b/templates/topic.html
@@ -75,7 +75,7 @@
 
 		<a class="username hide_on_micro like_count" aria-label="{{lang "topic.like_count_aria"}}">{{.Topic.LikeCount}}</a><a class="username hide_on_micro like_count_label" title="{{lang "topic.like_count_tooltip"}}"></a>
 
-		{{if .Topic.Tag}}<a class="username hide_on_micro user_tag">{{.Topic.Tag}}</a>{{else}}<a class="username hide_on_micro level" aria-label="{{lang "topic.level_aria"}}">{{level .Topic.Level}}</a><a class="username hide_on_micro level_label" style="float:right;" title="{{lang "topic.level_tooltip"}}"></a>{{end}}
+		{{if .Topic.Tag}}<a class="username hide_on_micro user_tag">{{.Topic.Tag}}</a>{{else}}<a class="username hide_on_micro level" aria-label="{{lang "topic.level_aria"}}" title="{{lang "topic.level_tooltip"}}">{{level .Topic.Level}}</a><a class="username hide_on_micro level_label" title="{{lang "topic.level_tooltip"}}"></a>{{end}}
 
 		</span>
 	</div>
diff --git a/templates/topic_posts.html b/templates/topic_posts.html
index 47660139..73c7b0bc 100644
--- a/templates/topic_posts.html
+++ b/templates/topic_posts.html
@@ -24,7 +24,7 @@
 
 		<a class="username hide_on_micro like_count">{{.LikeCount}}</a><a class="username hide_on_micro like_count_label" title="{{lang "topic.post_like_count_tooltip"}}"></a>
 
-		{{if .Tag}}<a class="username hide_on_micro user_tag">{{.Tag}}</a>{{else}}<a class="username hide_on_micro level" aria-label="{{lang "topic.post_level_aria"}}">{{.Level}}</a><a class="username hide_on_micro level_label" style="float:right;" title="{{lang "topic.post_level_tooltip"}}"></a>{{end}}
+		{{if .Tag}}<a class="username hide_on_micro user_tag">{{.Tag}}</a>{{else}}<a class="username hide_on_micro level" aria-label="{{lang "topic.post_level_aria"}}" title="{{lang "topic.post_level_tooltip"}}">{{.Level}}</a><a class="username hide_on_micro level_label" title="{{lang "topic.post_level_tooltip"}}"></a>{{end}}
 
 		</span>
 	</article>
diff --git a/themes/tempra-simple/public/main.css b/themes/tempra-simple/public/main.css
index c7769180..8605ac25 100644
--- a/themes/tempra-simple/public/main.css
+++ b/themes/tempra-simple/public/main.css
@@ -706,6 +706,7 @@ button.username {
 .level_label {
 	color: #505050;
 	opacity: 0.85;
+	float: right;
 }
 .level_hideable {
 	display: none;