diff --git a/templates/status.tmpl b/templates/status.tmpl
index 5ada84e..9bc1354 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -23,13 +23,13 @@
 		</div>
 		<div class="status"> 
 			<div class="status-name">
-				<bdi class="status-dname"> {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} </bdi>
+				<bdi class="status-dname"> {{EmojiFilter (HTML .Account.DisplayName) .Account.Emojis | Raw}} {{if .Account.Bot}}🤖{{end}}</bdi>
 				<a href="/user/{{.Account.ID}}">
 					<span class="status-uname"> @{{.Account.Acct}} </span>
 				</a>
 				<div class="more-container">
 					<div class="remote-link">
-						{{if .IDNumbers}}#{{index .IDNumbers .ID}}{{end}} {{.Visibility}}
+						{{if .IDNumbers}}#{{index .IDNumbers .ID}}{{end}} {{.Visibility}} {{.ID}}
 					</div>
 					<div class="more-content">
 						<a class="more-link" href="{{.URL}}" target="_blank">
@@ -92,7 +92,8 @@
 			</div>
 			{{if (or .Content .SpoilerText)}}
 			<div class="status-content">
-				{{if .SpoilerText}}{{EmojiFilter (HTML .SpoilerText) .Emojis | Raw}}<br/>{{end}}
+				{{if .Sensitive}}[NSFW]<br/>{{end}}
+				{{if .SpoilerText}}[{{EmojiFilter (HTML .SpoilerText) .Emojis | Raw}}]<br/>{{end}}
 				{{StatusContentFilter .Content .Emojis .Mentions | Raw}}
 			</div>
 			{{end}}
diff --git a/templates/user.tmpl b/templates/user.tmpl
index 5342efe..2d35daf 100644
--- a/templates/user.tmpl
+++ b/templates/user.tmpl
@@ -129,9 +129,14 @@
 			{{if .IsCurrent}} - <a href="/filters"> filters </a> {{end}}
 		</div>
 	</div>
+	
+	<details>
+	<summary>About user</summary>
 	<div class="user-profile-decription">
+	[User created: {{.User.CreatedAt}}]<br>
 	{{EmojiFilter .User.Note .User.Emojis | Raw}}
 	</div>
+	</details>
 	{{if .User.Fields}}
 	<div class="user-fields">
 		{{range .User.Fields}}
@@ -199,6 +204,9 @@
 	{{if .NextLink}}
 		<a href="{{.NextLink}}">[next]</a>
 	{{end}}
+	{{if .PrevLink}}
+		<br><a href="{{.PrevLink}}">[prev]</a>
+	{{end}}
 </div>
 
 {{template "footer.tmpl"}}