diff --git a/README.md b/README.md
index 353f399..6583b6c 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,15 @@ See the `scripts/` directory on how to install gowiki on Linux or OpenBSD.
 }
 ```
 
-## GoWiki on OpenBSD
+## Features
+
+* Fulltext indexing of wiki pages
+* Password hashing using BCrypt
+* 2FA using TOTP
+* Content Security Policy
+* No Javascript (yet)
+* Private wiki pages
+
+### GoWiki on OpenBSD
 
 GoWiki makes use of the OpenBSD native security features [pledge(2)](https://man.openbsd.org/pledge) and [unveil(2)](https://man.openbsd.org/unveil).
diff --git a/pkg/server/templates.go b/pkg/server/templates.go
index e2baee8..b7f22fc 100644
--- a/pkg/server/templates.go
+++ b/pkg/server/templates.go
@@ -679,12 +679,14 @@ const (
                 </div>
                 {{if .Admin}}
                 <div class="form-group">
-                    <label class="col-form-label" for="admin">Admin Privileges</label>
-                    {{if .Data.Admin}}
-                    <input type="checkbox" id="admin" name="admin" value="0" checked>
-                    {{else}}
-                    <input type="checkbox" id="admin" name="admin" value="0">
-                    {{end}}
+                    <div class="custom-control custom-checkbox">
+                        {{if .Data.Admin}}
+                        <input type="checkbox" class="custom-control-input" id="admin" name="admin" value="0" checked>
+                        {{else}}
+                        <input type="checkbox" class="custom-control-input" id="admin" name="admin" value="0">
+                        {{end}}
+                        <label class="custom-control-label" for="admin">Admin Privileges</label>
+                    </div>
                 </div>
                 {{end}}
                 <button class="btn btn-sm btn-primary" type="submit">Update</button>
@@ -735,8 +737,10 @@ const (
                     <input class="form-control input-sm" type="password" id="repeat" name="repeat" required>
                 </div>
                 <div class="form-group">
-                    <label class="col-form-label" for="admin">Admin Privileges</label>
-                    <input type="checkbox" id="admin" name="admin" value="0">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="admin" name="admin" value="0">
+                        <label class="custom-control-label" for="admin">Admin Privileges</label>
+                    </div>
                 </div>
                 <button class="btn btn-sm btn-primary" type="submit">Create</button>
                 <a href="/users" class="btn btn-sm btn-primary">Back</a>
diff --git a/templates/userEdit.html b/templates/userEdit.html
index a0f9d9a..2381082 100644
--- a/templates/userEdit.html
+++ b/templates/userEdit.html
@@ -28,12 +28,14 @@
                 </div>
                 {{if .Admin}}
                 <div class="form-group">
-                    <label class="col-form-label" for="admin">Admin Privileges</label>
-                    {{if .Data.Admin}}
-                    <input type="checkbox" id="admin" name="admin" value="0" checked>
-                    {{else}}
-                    <input type="checkbox" id="admin" name="admin" value="0">
-                    {{end}}
+                    <div class="custom-control custom-checkbox">
+                        {{if .Data.Admin}}
+                        <input type="checkbox" class="custom-control-input" id="admin" name="admin" value="0" checked>
+                        {{else}}
+                        <input type="checkbox" class="custom-control-input" id="admin" name="admin" value="0">
+                        {{end}}
+                        <label class="custom-control-label" for="admin">Admin Privileges</label>
+                    </div>
                 </div>
                 {{end}}
                 <button class="btn btn-sm btn-primary" type="submit">Update</button>
diff --git a/templates/userNew.html b/templates/userNew.html
index 0166fd6..632f7aa 100644
--- a/templates/userNew.html
+++ b/templates/userNew.html
@@ -21,8 +21,10 @@
                     <input class="form-control input-sm" type="password" id="repeat" name="repeat" required>
                 </div>
                 <div class="form-group">
-                    <label class="col-form-label" for="admin">Admin Privileges</label>
-                    <input type="checkbox" id="admin" name="admin" value="0">
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="admin" name="admin" value="0">
+                        <label class="custom-control-label" for="admin">Admin Privileges</label>
+                    </div>
                 </div>
                 <button class="btn btn-sm btn-primary" type="submit">Create</button>
                 <a href="/users" class="btn btn-sm btn-primary">Back</a>