Redesign return from settings page

src/site/pug/home.pug

@@ -36,7 +36,7 @@ html
 
 				h2 About this instance
 				ul
-					li: a(href="/settings") Settings
+					li: a(href=settingsReferrer) Settings
 					if hasPrivacyPolicy
 						li: a(href="/privacy") Privacy policy
 					else

src/site/pug/settings.pug

@@ -34,9 +34,12 @@ html
 		if status && message
 			.status-notice(class=status)= message
 			script.
-				history.replaceState(null, "", "/settings")
+				const params = new URLSearchParams(window.location.search)
+				params.delete("status")
+				params.delete("message")
+				history.replaceState(null, "", "?" + params.toString())
 		main.settings
-			form(action="/settings" method="post" enctype="application/x-www-form-urlencoded")
+			form(action=returnAction method="post" enctype="application/x-www-form-urlencoded")
 				input(type="hidden" name="csrf" value=csrf)
 
 				h1 Settings
@@ -123,5 +126,6 @@ html
 									span.fake-checkbox
 
 				.action-container
-					a(href="/").home-link ← Home
-					button(type="submit").save-button Save settings
+					span.home-link-container: a(href=returnURL).home-link ← Return
+					button(type="submit" formaction=stayAction).save-button Save
+					button(type="submit").save-button Save & return

src/site/pug/user.pug

@@ -35,7 +35,7 @@ html
 			//- Alt text guidelines from https://axesslab.com/alt-texts/
 			a(href="/").nav-icon-link
 				img(src="/static/img/logo-circle-min.svg" alt="Bibliogram").logo
-			a(href="/settings").nav-icon-link
+			a(href=settingsReferrer).nav-icon-link
 				img(src="/static/img/settings.svg" alt="Settings").settings
 		.main-divider
 			header.profile-overview
@@ -74,7 +74,7 @@ html
 					section.bibliogram-meta
 						.links
 							a(href="/") Home
-							a(href="/settings") Settings
+							a(href=settingsReferrer) Settings
 
 			- const hasPosts = !user.data.is_private && user.timeline.pages.length && user.timeline.pages[0].length
 			main(class=hasPosts ? "" : "no-posts")#timeline.timeline