diff --git a/web/templates/add-tag.html b/web/templates/add-tag.html
index 13fba97..0739210 100644
--- a/web/templates/add-tag.html
+++ b/web/templates/add-tag.html
@@ -1,8 +1,10 @@
 {{define "page-content"}}
 <h2>Neuer Benutzer</h2>
+
 <form>
     <input required name="tag" placeholder="Tag" type="text" />
     <input type="submit" value="Anlegen" hx-post="/add-tag/" hx-target="#page-content" />
 </form>
+
 <button hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
 {{end}}
diff --git a/web/templates/add-user.html b/web/templates/add-user.html
index 2b73628..1eed464 100644
--- a/web/templates/add-user.html
+++ b/web/templates/add-user.html
@@ -1,24 +1,31 @@
 {{define "page-content"}}
 <h2>Neuer Benutzer</h2>
 <form>
-    <input required name="username" placeholder="Benutzername" type="text" value="{{.UserName}}" />
-    <input required name="password" placeholder="Passwort" type="password" />
-    <input required name="password2" placeholder="Passwort wiederholen" type="password" />
+    <div>
+        <input required name="username" placeholder="Benutzername" type="text" value="{{.UserName}}" />
+        <input required name="password" placeholder="Passwort" type="password" />
+        <input required name="password2" placeholder="Passwort wiederholen" type="password" />
+    </div>
 
-    <input required name="first-name" placeholder="Vorname" type="text" value="{{.FirstName}}" />
-    <input required name="last-name" placeholder="Nachname" type="text" value="{{.LastName}}" />
+    <div>
+        <input required name="first-name" placeholder="Vorname" type="text" value="{{.FirstName}}" />
+        <input required name="last-name" placeholder="Nachname" type="text" value="{{.LastName}}" />
+    </div>
 
-    <input required id="author" name="role" type="radio" value="3" {{if eq .Role 3 }}checked{{end}} />
-    <label for="author">Autor</label>
-    <input required id="editor" name="role" type="radio" value="2" {{if eq .Role 2 }}checked{{end}} />
-    <label for="editor">Redakteur</label>
-    <input required id="publisher" name="role" type="radio" value="1" {{if eq .Role 1 }}checked{{end}} />
-    <label for="publisher">Herausgeber</label>
-    <input required id="admin" name="role" type="radio" value="0" {{if eq .Role 0 }}checked{{end}} />
-    <label for="admin">Admin</label>
+    <div>
+        <input required id="author" name="role" type="radio" value="3" {{if eq .Role 3 }}checked{{end}} />
+        <label for="author">Autor</label>
+        <input required id="editor" name="role" type="radio" value="2" {{if eq .Role 2 }}checked{{end}} />
+        <label for="editor">Redakteur</label>
+        <input required id="publisher" name="role" type="radio" value="1" {{if eq .Role 1 }}checked{{end}} />
+        <label for="publisher">Herausgeber</label>
+        <input required id="admin" name="role" type="radio" value="0" {{if eq .Role 0 }}checked{{end}} />
+        <label for="admin">Admin</label>
+    </div>
 
     <input type="submit" value="Anlegen" hx-post="/add-user/" hx-target="#page-content" />
 </form>
+
 <button hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
 
 <script>
diff --git a/web/templates/current-articles.html b/web/templates/current-articles.html
index 9f3a981..2094857 100644
--- a/web/templates/current-articles.html
+++ b/web/templates/current-articles.html
@@ -1,10 +1,13 @@
 {{define "page-content"}}
-{{range .}}
 <div>
-    <h1>{{.Title}}</h1>
-    <p>{{.Description}}</p>
+    {{range .}}
+    <div>
+        <h1>{{.Title}}</h1>
+        <p>{{.Description}}</p>
+    </div>
+    {{end}}
 </div>
-{{end}}
+
 <button hx-get="/publish-issue/" hx-target="#page-content">Ausgabe publizieren</button>
 <button hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
 {{end}}
diff --git a/web/templates/edit-user.html b/web/templates/edit-user.html
index 3bce732..df8ac6d 100644
--- a/web/templates/edit-user.html
+++ b/web/templates/edit-user.html
@@ -1,13 +1,19 @@
 {{define "page-content"}}
 <form>
-    <input name="username" type="text" value="{{.UserName}}" />
-    <input name="first-name" type="text" value="{{.FirstName}}" />
-    <input name="last-name" type="text" value="{{.LastName}}" />
+    <div>
+        <input name="username" type="text" value="{{.UserName}}" />
+        <input name="first-name" type="text" value="{{.FirstName}}" />
+        <input name="last-name" type="text" value="{{.LastName}}" />
+    </div>
 
-    <input name="old-password" placeholder="Altes Passwort" type="password" />
-    <input name="password" placeholder="Neues Passwort" type="password" />
-    <input name="password2" placeholder="Wiederholen" type="password" />
+    <div>
+        <input name="old-password" placeholder="Altes Passwort" type="password" />
+        <input name="password" placeholder="Neues Passwort" type="password" />
+        <input name="password2" placeholder="Wiederholen" type="password" />
+    </div>
 
     <input type="submit" value="Aktualisieren" hx-post="/update-user/" hx-target="#page-content" />
 </form>
+
+<button hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
 {{end}}
diff --git a/web/templates/editor.html b/web/templates/editor.html
index bb45aea..f0f8b9b 100644
--- a/web/templates/editor.html
+++ b/web/templates/editor.html
@@ -1,13 +1,23 @@
 {{define "page-content"}}
 <h2>Editor</h2>
 <form>
-    <input name="article-title" placeholder="Titel" type="text" />
-    <textarea name="article-description" placeholder="Beschreibung"></textarea>
-    <textarea name="article-content" placeholder="Artikel"></textarea>
-    {{range .}}
-    <input id="{{.Name}}" name="tags" type="checkbox" value="{{.ID}}" />
-    <label for="{{.Name}}">{{.Name}}</label>
-    {{end}}
+    <div>
+        <input name="article-title" placeholder="Titel" type="text" />
+        <textarea name="article-description" placeholder="Beschreibung"></textarea>
+        <textarea name="article-content" placeholder="Artikel"></textarea>
+    </div>
+
+    <div>
+        {{range .}}
+        <div>
+            <input id="{{.Name}}" name="tags" type="checkbox" value="{{.ID}}" />
+            <label for="{{.Name}}">{{.Name}}</label>
+        </div>
+        {{end}}
+    </div>
+
     <input type="submit" value="Senden" hx-post="/submit-article/" hx-target="#page-content" />
 </form>
+
+<button hx-get="/hub/" hx-target="#page-content">Abbrechen</button>
 {{end}}
diff --git a/web/templates/hub.html b/web/templates/hub.html
index 23ed834..fad1099 100644
--- a/web/templates/hub.html
+++ b/web/templates/hub.html
@@ -1,17 +1,25 @@
 {{define "page-content"}}
 <h2>Hub</h2>
-<button hx-get="/write-article/" hx-target="#page-content">Artikel schreiben</button>
-<button hx-get="/rejected-articles/" hx-target="#page-content">Abgelehnte Artikel</button>
-<button hx-get="/rss/" hx-target="#page-content">RSS Feed</button>
-<button hx-get="/edit-user/" hx-target="#page-content">Benutzer bearbeiten</button>
+<div>
+    <button hx-get="/write-article/" hx-target="#page-content">Artikel schreiben</button>
+    <button hx-get="/rejected-articles/" hx-target="#page-content">Abgelehnte Artikel</button>
+    <button hx-get="/rss/" hx-target="#page-content">RSS Feed</button>
+    <button hx-get="/edit-user/" hx-target="#page-content">Benutzer bearbeiten</button>
+</div>
 {{if lt . 3}}
-<button hx-get="/unpublished-articles/" hx-target="#page-content">Unveröffentlichte Artikel</button>
-<button hx-get="/create-tag/" hx-target="#page-content">Neuer Tag</button>
+<div>
+    <button hx-get="/unpublished-articles/" hx-target="#page-content">Unveröffentlichte Artikel</button>
+    <button hx-get="/create-tag/" hx-target="#page-content">Neuer Tag</button>
+</div>
 {{end}}
 {{if lt . 2}}
-<button hx-get="/this-issue/" hx-target="#page-content">Diese Ausgabe</button>
+<div>
+    <button hx-get="/this-issue/" hx-target="#page-content">Diese Ausgabe</button>
+</div>
 {{end}}
 {{if eq . 0}}
-<button hx-get="/create-user/" hx-target="#page-content">Benutzer hinzufügen</button>
+<div>
+    <button hx-get="/create-user/" hx-target="#page-content">Benutzer hinzufügen</button>
+</div>
 {{end}}
 {{end}}
diff --git a/web/templates/login.html b/web/templates/login.html
index 9469601..eb5e2ef 100644
--- a/web/templates/login.html
+++ b/web/templates/login.html
@@ -1,8 +1,11 @@
 {{define "page-content"}}
 <h2>Anmeldung</h2>
 <form>
-    <input name="username" placeholder="Benutzername" type="text" />
-    <input name="password" placeholder="Passwort" type="password" />
+    <div>
+        <input name="username" placeholder="Benutzername" type="text" />
+        <input name="password" placeholder="Passwort" type="password" />
+    </div>
+
     <input type="submit" value="Anmelden" hx-post="/login/" hx-target="#page-content" />
 </form>
 {{end}}
diff --git a/web/templates/rejected-articles.html b/web/templates/rejected-articles.html
index 44c43e9..8dfea60 100644
--- a/web/templates/rejected-articles.html
+++ b/web/templates/rejected-articles.html
@@ -1,12 +1,18 @@
 {{define "page-content"}}
 <form>
-    {{range .RejectedArticles}}
-    {{if index $.MyIDs .ID}}
-    <input required id="{{.ID}}" name="id" type="radio" value="{{.ID}}" />
-    <label for="{{.ID}}">{{.Title}}</label>
-    {{end}}
-    {{end}}
+    <div>
+        {{range .RejectedArticles}}
+        <div>
+            {{if index $.MyIDs .ID}}
+            <input required id="{{.ID}}" name="id" type="radio" value="{{.ID}}" />
+            <label for="{{.ID}}">{{.Title}}</label>
+            {{end}}
+        </div>
+        {{end}}
+    </div>
+
     <input type="submit" value="Auswählen" hx-post="/review-rejected-article/" hx-target="#page-content" />
 </form>
+
 <button hx-get="/hub/" hx-target="#page-content">Zurück</button>
 {{end}}
diff --git a/web/templates/rework-article.html b/web/templates/rework-article.html
index dfd836d..4fd880a 100644
--- a/web/templates/rework-article.html
+++ b/web/templates/rework-article.html
@@ -1,16 +1,25 @@
 {{define "page-content"}}
 <h2>Editor</h2>
 <form>
-    <input name="article-title" placeholder="Titel" type="text" value="{{.Article.Title}}" />
-    <textarea name="article-description" placeholder="Beschreibung">{{.Article.Description}}</textarea>
-    <textarea name="article-content" placeholder="Artikel">{{.Article.Content}}</textarea>
-    <input name="article-id" type="hidden" value="{{.Article.ID}}" />
+    <div>
+        <input name="article-title" placeholder="Titel" type="text" value="{{.Article.Title}}" />
+        <textarea name="article-description" placeholder="Beschreibung">{{.Article.Description}}</textarea>
+        <textarea name="article-content" placeholder="Artikel">{{.Article.Content}}</textarea>
+        <input name="article-id" type="hidden" value="{{.Article.ID}}" />
+    </div>
 
-    {{range .Tags}}
-    <input id="tag-{{.Name}}" name="tags" type="checkbox" value="{{.ID}}" {{if index $.Selected .ID}}checked{{end}} />
-    <label for="tag-{{.Name}}">{{.Name}}</label>
-    {{end}}
+    <div>
+        {{range .Tags}}
+        <div>
+            <input id="tag-{{.Name}}" name="tags" type="checkbox" value="{{.ID}}" {{if index $.Selected
+                .ID}}checked{{end}} />
+            <label for="tag-{{.Name}}">{{.Name}}</label>
+        </div>
+        {{end}}
+    </div>
 
     <input type="submit" value="Senden" hx-post="/resubmit-article/" hx-target="#page-content" />
 </form>
+
+<button hx-get="/hub/" hx-target="#page-content">Zurück</button>
 {{end}}
diff --git a/web/templates/to-be-published.html b/web/templates/to-be-published.html
index 7b42c70..3a3857a 100644
--- a/web/templates/to-be-published.html
+++ b/web/templates/to-be-published.html
@@ -5,9 +5,9 @@
     {{.Article.Content}}
 
     <p>
-    {{range .Tags}}
-    {{.Name}}
-    {{end}}
+        {{range .Tags}}
+        {{.Name}}
+        {{end}}
     </p>
 
     <input name="id" type="hidden" value="{{.Article.ID}}" />
diff --git a/web/templates/unpublished-articles.html b/web/templates/unpublished-articles.html
index d66c5e8..16188f5 100644
--- a/web/templates/unpublished-articles.html
+++ b/web/templates/unpublished-articles.html
@@ -1,10 +1,16 @@
 {{define "page-content"}}
 <form>
-    {{range .}}
-    <input required id="{{.ID}}" name="id" type="radio" value="{{.ID}}" />
-    <label for="{{.ID}}">{{.Title}}</label>
-    {{end}}
+    <div>
+        {{range .}}
+        <div>
+            <input required id="{{.ID}}" name="id" type="radio" value="{{.ID}}" />
+            <label for="{{.ID}}">{{.Title}}</label>
+        </div>
+        {{end}}
+    </div>
+
     <input type="submit" value="Auswählen" hx-post="/review-unpublished-article/" hx-target="#page-content" />
 </form>
+
 <button hx-get="/hub/" hx-target="#page-content">Zurück</button>
 {{end}}