diff --git a/src/main/java/me/minidigger/hangar/controller/ApplicationController.java b/src/main/java/me/minidigger/hangar/controller/ApplicationController.java
index 7a17ed9f1..a49193155 100644
--- a/src/main/java/me/minidigger/hangar/controller/ApplicationController.java
+++ b/src/main/java/me/minidigger/hangar/controller/ApplicationController.java
@@ -18,23 +18,25 @@ public class ApplicationController extends HangarController {
     }
 
     @RequestMapping("/admin/activities/{user}")
-    public Object showActivities(@PathVariable Object user) {
-        return null; // TODO implement showActivities request controller
+    public ModelAndView showActivities(@PathVariable String user) {
+        ModelAndView mav = new ModelAndView("users/admin/activity");
+        mav.addObject("username", user);
+        return fillModel(mav);
     }
 
     @RequestMapping("/admin/approval/projects")
     public Object showProjectVisibility() {
-        return null; // TODO implement showProjectVisibility request controller
+        return fillModel(new ModelAndView("users/admin/visibility")); // TODO implement showProjectVisibility request controller
     }
 
     @RequestMapping("/admin/approval/versions")
-    public Object showQueue() {
-        return null; // TODO implement showQueue request controller
+    public ModelAndView showQueue() {
+        return fillModel(new ModelAndView("users/admin/queue")); // TODO implement showQueue request controller
     }
 
     @RequestMapping("/admin/flags")
     public Object showFlags() {
-        return null; // TODO implement showFlags request controller
+        return fillModel(new ModelAndView("users/admin/flags")); // TODO implement showFlags request controller
     }
 
     @RequestMapping("/admin/flags/{id}/resolve/{resolved}")
@@ -43,18 +45,24 @@ public class ApplicationController extends HangarController {
     }
 
     @RequestMapping("/admin/health")
-    public Object showHealth() {
-        return null; // TODO implement showHealth request controller
+    public ModelAndView showHealth() {
+        return fillModel(new ModelAndView("users/admin/health")); // TODO implement showHealth request controller
     }
 
     @RequestMapping("/admin/log")
-    public Object showLog(@RequestParam Object page, @RequestParam Object userFilter, @RequestParam Object projectFilter, @RequestParam Object versionFilter, @RequestParam Object pageFilter, @RequestParam Object actionFilter, @RequestParam Object subjectFilter) {
-        return null; // TODO implement showLog request controller
+    public ModelAndView showLog(@RequestParam(required = false) Object page,
+                                @RequestParam(required = false) Object userFilter,
+                                @RequestParam(required = false) Object projectFilter,
+                                @RequestParam(required = false) Object versionFilter,
+                                @RequestParam(required = false) Object pageFilter,
+                                @RequestParam(required = false) Object actionFilter,
+                                @RequestParam(required = false) Object subjectFilter) {
+        return fillModel(new ModelAndView("users/admin/log"));  // TODO implement showLog request controller
     }
 
     @RequestMapping("/admin/stats")
-    public Object showStats(@RequestParam Object from, @RequestParam Object to) {
-        return null; // TODO implement showStats request controller
+    public ModelAndView showStats(@RequestParam(required = false) Object from, @RequestParam(required = false) Object to) {
+        return fillModel(new ModelAndView("users/admin/stats")); // TODO implement showStats request controller
     }
 
     @RequestMapping("/admin/user/{user}")
diff --git a/src/main/java/me/minidigger/hangar/controller/OrgController.java b/src/main/java/me/minidigger/hangar/controller/OrgController.java
index 5e1c4b8dd..d98e21174 100644
--- a/src/main/java/me/minidigger/hangar/controller/OrgController.java
+++ b/src/main/java/me/minidigger/hangar/controller/OrgController.java
@@ -19,8 +19,8 @@ public class OrgController extends HangarController {
     }
 
     @GetMapping("/organisations/new")
-    public Object showCreator() {
-        return null; // TODO implement showCreator request controller
+    public ModelAndView showCreator() {
+        return fillModel(new ModelAndView("createOrganization"));
     }
 
     @PostMapping("/organisations/new")
diff --git a/src/main/java/me/minidigger/hangar/controller/ProjectsController.java b/src/main/java/me/minidigger/hangar/controller/ProjectsController.java
index f3dcc1168..723b0c25f 100644
--- a/src/main/java/me/minidigger/hangar/controller/ProjectsController.java
+++ b/src/main/java/me/minidigger/hangar/controller/ProjectsController.java
@@ -30,7 +30,7 @@ public class ProjectsController extends HangarController {
 
     @RequestMapping("/new")
     public Object showCreator() {
-        return null; // TODO implement showCreator request controller
+        return fillModel(new ModelAndView("projects/create"));
     }
 
     @RequestMapping("/{author}/{slug}")
diff --git a/src/main/java/me/minidigger/hangar/controller/ReviewsController.java b/src/main/java/me/minidigger/hangar/controller/ReviewsController.java
index 153341884..34617efc3 100644
--- a/src/main/java/me/minidigger/hangar/controller/ReviewsController.java
+++ b/src/main/java/me/minidigger/hangar/controller/ReviewsController.java
@@ -13,7 +13,7 @@ public class ReviewsController extends HangarController {
 
     @RequestMapping("/{author}/{slug}/versions/{version}/reviews")
     public Object showReviews(@PathVariable Object author, @PathVariable Object slug, @PathVariable Object version) {
-        return null; // TODO implement showReviews request controller
+        return fillModel(new ModelAndView("users/admin/reviews")); // TODO implement showReviews request controller
     }
 
     @RequestMapping("/{author}/{slug}/versions/{version}/reviews/addmessage")
diff --git a/src/main/resources/templates/createOrganization.ftlh b/src/main/resources/templates/createOrganization.ftlh
index 7d86d8b89..e3fa8669d 100644
--- a/src/main/resources/templates/createOrganization.ftlh
+++ b/src/main/resources/templates/createOrganization.ftlh
@@ -1,11 +1,3 @@
-<#--
-@import controllers.sugar.Requests.OreRequest
-@import ore.OreConfig
-@import ore.permission.role.RoleCategory
-@import views.html.helper.{CSRF, form}
-@()(implicit messages: Messages, flash: Flash, request: OreRequest[_], config: OreConfig, assetsFinder: AssetsFinder)
--->
-
 <#import "/spring.ftl" as spring />
 <#import "*/utils/hangar.ftlh" as hangar />
 <#import "*/layout/base.ftlh" as base />
diff --git a/src/main/resources/templates/projects/create.ftlh b/src/main/resources/templates/projects/create.ftlh
index 48ef7f447..12fa07252 100644
--- a/src/main/resources/templates/projects/create.ftlh
+++ b/src/main/resources/templates/projects/create.ftlh
@@ -2,6 +2,7 @@
 <#import "*/utils/hangar.ftlh" as hangar />
 <#import "*/layout/base.ftlh" as base />
 
+<#--
 @*
 Page used for uploading and creating new projects.
 *@
@@ -15,7 +16,7 @@ Page used for uploading and creating new projects.
 @import ore.models.user.User
 @import views.html.helper.{CSRF, form}
 @(createProjectOrgas: Seq[Model[Organization]], user: Model[User])(implicit messages: Messages, flash: Flash, request: OreRequest[_], config: OreConfig, assetsFinder: AssetsFinder)
-
+-->
 <#assign scriptsVar>
     <script type="text/javascript" src="<@hangar.url "javascripts/projectCreateValidate.js" />"></script>
     <script type="text/javascript" src="<@hangar.url "javascripts/pluginUpload.js" />"></script>
@@ -35,8 +36,8 @@ Page used for uploading and creating new projects.
 
                 <div class="panel-body project-body">
                     <div class="minor create-blurb">
-                        <p>@Html(messages("project.create.infoText.head"))</p>
-                        <p>@Html(messages("project.create.infoText.guidelines"))</p>
+                        <p><@spring.message "project.create.infoText.head" /></p>
+                        <p><@spring.message "project.create.infoText.guidelines" /></p>
                     </div>
 
                     <div>
@@ -57,7 +58,7 @@ Page used for uploading and creating new projects.
                                 <select id="projectCategory" name="category" class="form-control">
                                     <#-- todo: Category.visible -->
                                 <#list Category.visible as cat>
-                                    <option>${cat.title<}/option>
+                                    <option>${cat.title}</option>
                                 </#list>
                                 </select>
                             </div>
diff --git a/src/main/resources/templates/users/admin/activity.ftlh b/src/main/resources/templates/users/admin/activity.ftlh
index ebb33d380..6df991cb3 100644
--- a/src/main/resources/templates/users/admin/activity.ftlh
+++ b/src/main/resources/templates/users/admin/activity.ftlh
@@ -2,6 +2,7 @@
 <#import "*/utils/hangar.ftlh" as hangar />
 <#import "*/layout/base.ftlh" as base />
 
+<#--
 @import java.time.OffsetDateTime
 
 @import controllers.sugar.Requests.OreRequest
@@ -9,14 +10,15 @@
 @import ore.OreConfig
 @import util.StringFormatterUtils._
 @(username: String, activities: Seq[Either[FlagActivity, ReviewActivity]])(implicit messages: Messages, request: OreRequest[_], config: OreConfig, flash: Flash, assetsFinder: AssetsFinder)
+-->
 
 <#assign message><@spring.message "activity.title" /></#assign>
-<@base.base title=("${message}" + username)>
+<@base.base title=("${message} ${username}")>
 
     <div class="row">
         <div class="col-md-12  header-flags">
             <div class="clearfix">
-                <h1 class="pull-left"><@spring.message "activity.title" /> <i>@username</i></h1>
+                <h1 class="pull-left"><@spring.message "activity.title" /> <i>${username}</i></h1>
             </div>
         </div>
     </div>
@@ -61,4 +63,4 @@
             </div>
         </div>
     </div>
-</@base.base>
\ No newline at end of file
+</@base.base>
diff --git a/src/main/resources/templates/users/admin/flags.ftlh b/src/main/resources/templates/users/admin/flags.ftlh
index ece5e7ef0..89585c090 100644
--- a/src/main/resources/templates/users/admin/flags.ftlh
+++ b/src/main/resources/templates/users/admin/flags.ftlh
@@ -2,6 +2,7 @@
 <#import "*/utils/hangar.ftlh" as hangar />
 <#import "*/layout/base.ftlh" as base />
 
+<#--
 @import controllers.sugar.Requests.OreRequest
 @import models.querymodels.ShownFlag
 @import ore.OreConfig
@@ -12,7 +13,7 @@
 
 @* project perms for all visibilities *@
 @(flags: Seq[ShownFlag])(implicit messages: Messages, request: OreRequest[_], config: OreConfig, flash: Flash, assetsFinder: AssetsFinder)
-
+-->
 <#assign scriptsVar>
     <script type="text/javascript" src="<@hangar.url "javascripts/flags.js" />"></script>
     <script type="text/javascript" src="<@hangar.url "javascripts/hideProject.js" />"></script>
diff --git a/src/main/resources/templates/users/admin/health.ftlh b/src/main/resources/templates/users/admin/health.ftlh
index 048ca5cd6..c586b33ef 100644
--- a/src/main/resources/templates/users/admin/health.ftlh
+++ b/src/main/resources/templates/users/admin/health.ftlh
@@ -2,6 +2,7 @@
 <#import "*/utils/hangar.ftlh" as hangar />
 <#import "*/layout/base.ftlh" as base />
 
+<#--
 @import controllers.sugar.Requests.OreRequest
 @import models.querymodels.UnhealtyProject
 @import ore.OreConfig
@@ -12,6 +13,7 @@
   notPublicProjects: Seq[UnhealtyProject],
   missingFileProjects: Seq[(Version, Project)],
   erroredJobs: Seq[Job])(implicit request: OreRequest[_], messages: Messages, config: OreConfig, flash: Flash, assetsFinder: AssetsFinder)
+-->
 
 <#assign message><@spring.message "admin.health.title" /></#assign>
 <@base.base title="${message}">
diff --git a/src/main/resources/templates/users/admin/log.ftlh b/src/main/resources/templates/users/admin/log.ftlh
index 7b4aec60d..b2fc15a74 100644
--- a/src/main/resources/templates/users/admin/log.ftlh
+++ b/src/main/resources/templates/users/admin/log.ftlh
@@ -2,6 +2,7 @@
 <#import "*/utils/hangar.ftlh" as hangar />
 <#import "*/layout/base.ftlh" as base />
 
+<#--
 @import controllers.sugar.Requests.OreRequest
 @import ore.OreConfig
 @import ore.db.{DbRef, Model}
@@ -13,6 +14,7 @@
 @(actions: Seq[Model[LoggedActionViewModel[_]]], limit: Int, offset: Int, page: Int, size: Int, userFilter: Option[String],
         projectFilter: Option[String], versionFilter: Option[String], pageFilter: Option[DbRef[Page]],
         actionFilter: Option[String], subjectFilter: Option[String], canViewIP: Boolean)(implicit messages: Messages, request: OreRequest[_], config: OreConfig, flash: Flash, assetsFinder: AssetsFinder)
+-->
 
 <#assign scriptsVar>
     <script type="text/javascript" src="<@hangar.url "diff-match-patch/javascript/diff_match_patch.js" />"></script>
diff --git a/src/main/resources/templates/users/admin/queue.ftlh b/src/main/resources/templates/users/admin/queue.ftlh
index c2cdc07a9..572e341cb 100644
--- a/src/main/resources/templates/users/admin/queue.ftlh
+++ b/src/main/resources/templates/users/admin/queue.ftlh
@@ -2,6 +2,7 @@
 <#import "*/utils/hangar.ftlh" as hangar />
 <#import "*/layout/base.ftlh" as base />
 
+<#--
 @import controllers.sugar.Requests.OreRequest
 @import models.querymodels.{NotStartedQueueEntry, ReviewedQueueEntry}
 @import ore.OreConfig
@@ -11,6 +12,7 @@
 @import views.html.helper.CSPNonce
 @import views.html.utils.userAvatar
 @(underReview: Seq[ReviewedQueueEntry], versions: Seq[NotStartedQueueEntry])(implicit messages: Messages, request: OreRequest[_], config: OreConfig, flash: Flash, assetsFinder: AssetsFinder)
+-->
 
 <#assign scriptsVar>
     <script @CSPNonce.attr type="text/javascript" src="<@hangar.url "javascripts/queue.js" />"></script>
diff --git a/src/main/resources/templates/users/admin/reviews.ftlh b/src/main/resources/templates/users/admin/reviews.ftlh
index d530ac0c0..e521ed44e 100644
--- a/src/main/resources/templates/users/admin/reviews.ftlh
+++ b/src/main/resources/templates/users/admin/reviews.ftlh
@@ -1,6 +1,8 @@
 <#import "/spring.ftl" as spring />
 <#import "*/utils/hangar.ftlh" as hangar />
+<#import "*/layout/base.ftlh" as base />
 
+<#--
 @import controllers.sugar.Requests.OreRequest
 @import ore.OreConfig
 @import ore.db.Model
@@ -13,14 +15,15 @@
 
 @(mostRecentUnfinishedReview: Option[Review], reviews: Seq[(Model[Review], Option[String])], project: Project, version: Model[Version])(implicit messages: Messages,
         request: OreRequest[_], config: OreConfig, flash: Flash, renderer: MarkdownRenderer, assetsFinder: AssetsFinder)
+-->
 
-<#macro scripts>
+<#assign scripts>
     <script @CSPNonce.attr type="text/javascript" src="<@hangar.url "javascripts/review.js" />"></script>
     <script @CSPNonce.attr>versionPath = '${helper.urlEncode(project.ownerName)}/${helper.urlEncode(project.slug)}/versions/${helper.urlEncode(version.name)}'</script>
-</#macro>
-
-@layout.base(messages("review.title", project.name, version.name), scripts) {
+</#assign>
 
+<#assign message><@spring.messageArgs code="review.title" args=[project.name version.name] /></#assign>
+<@base.base title=message additionalScripts=scripts>
     <div class="row">
         <div class="col-md-12  header-flags">
             <div class="clearfix">
@@ -204,4 +207,4 @@
             </div>
         </div>
     </div>
-}
+</@base.base>
diff --git a/src/main/resources/templates/users/admin/stats.ftlh b/src/main/resources/templates/users/admin/stats.ftlh
index b3da5c415..ccd4c3d96 100644
--- a/src/main/resources/templates/users/admin/stats.ftlh
+++ b/src/main/resources/templates/users/admin/stats.ftlh
@@ -2,6 +2,7 @@
 <#import "*/utils/hangar.ftlh" as hangar />
 <#import "*/layout/base.ftlh" as base />
 
+<#--
 @import java.time.LocalDate
 @import java.time.temporal.ChronoUnit
 
@@ -14,6 +15,7 @@
 
 @(stats: List[Stats], fromTime: LocalDate, toTime: LocalDate)(implicit messages: Messages,
         request: OreRequest[_], config: OreConfig, flash: Flash, assetsFinder: AssetsFinder)
+-->
 
 <#assign scriptsVar>
     <script @CSPNonce.attr type="text/javascript" src="<@hangar.url "lib/chart.js/dist/Chart.min.js" />"></script>
@@ -105,6 +107,7 @@
 </#assign>
 
 <@base.base title="Stats" additionalScripts=scriptsVar>
+    <h1>Stats</h1>
     <div class="row">
         <div class="col-md-12">
             <div class="form-inline">
diff --git a/src/main/resources/templates/users/admin/visibility.ftlh b/src/main/resources/templates/users/admin/visibility.ftlh
index 8a238f610..496e003af 100644
--- a/src/main/resources/templates/users/admin/visibility.ftlh
+++ b/src/main/resources/templates/users/admin/visibility.ftlh
@@ -2,14 +2,16 @@
 <#import "*/utils/hangar.ftlh" as hangar />
 <#import "*/layout/base.ftlh" as base />
 
+<#--
 @import controllers.sugar.Requests.OreRequest
 @import models.querymodels.ProjectNeedsApproval
 @import ore.OreConfig
 @import ore.markdown.MarkdownRenderer
 @(needsApproval: Seq[ProjectNeedsApproval],
  waitingProjects: Seq[ProjectNeedsApproval])(implicit messages: Messages, request: OreRequest[_], config: OreConfig, flash: Flash, renderer: MarkdownRenderer, assetsFinder: AssetsFinder)
+-->
 
-@renderApprovalList(projectSeq: Seq[ProjectNeedsApproval]) = {
+<#macro renderApprovalList projectSeq>
     <ul class="list-group list-flags-admin">
         <#if projectSeq.isEmpty>
             <li class="list-group-item">
@@ -41,7 +43,7 @@
             </li>
         }
     </ul>
-}
+</#macro>
 
 <#assign scriptsVar>
     <script type="text/javascript" src="<@hangar.url "javascripts/hideProject.js" />"></script>
@@ -61,7 +63,7 @@
                     <h4 class="panel-title pull-left">Needs Approval</h4>
                     <div class="clearfix"></div>
                 </div>
-                ${renderApprovalList(needsApproval)}
+                <@renderApprovalList needsApproval />
             </div>
         </div>
         <div class="row">
@@ -76,7 +78,7 @@
                         <h4 class="panel-title pull-left">Waiting Changes</h4>
                         <div class="clearfix"></div>
                     </div>
-                    ${renderApprovalList(waitingProjects)}
+                    <@renderApprovalList waitingProjects />
                 </div>
             </div>
         </div>