diff --git a/src/wa/server/WAAbstractPage.java b/src/wa/server/WAAbstractPage.java
index fa85fe9..576b758 100644
--- a/src/wa/server/WAAbstractPage.java
+++ b/src/wa/server/WAAbstractPage.java
@@ -109,7 +109,7 @@ public class WAAbstractPage implements HttpPage{
             if(page != null)
                 content = page.htmlResponse(context, client_info, session, cookie, request);
             if(content != null) {
-                tmpl.set("nav", context.getBreadcrumb().get(1));
+                content.set("nav", context.getBreadcrumb().get(1));
                 tmpl.set("content", content.compile());
             }
 
diff --git a/src/wa/server/page/ServicePage.java b/src/wa/server/page/ServicePage.java
index 82aa081..7c972d7 100644
--- a/src/wa/server/page/ServicePage.java
+++ b/src/wa/server/page/ServicePage.java
@@ -56,7 +56,7 @@ public class ServicePage implements WAPage {
 
         WANavigation nav = new WANavigation(NAVIGATION_NAME, this);
         for(WAService plugin : services) {
-            nav.addSubNav(new WANavigation(plugin.getName()));
+            nav.addSubNav(new WANavigation(plugin.getName(), plugin));
             statuses.add(new ServiceStatusPage(plugin.getStatus()));
         }
         WANavigation.addRootNav(nav);
diff --git a/src/wa/server/page/StatusPage.java b/src/wa/server/page/StatusPage.java
index adbb450..cf1be9d 100644
--- a/src/wa/server/page/StatusPage.java
+++ b/src/wa/server/page/StatusPage.java
@@ -59,7 +59,6 @@ public class StatusPage implements WAPage {
                                   Map<String, String> request) {
 
         WAStatus obj = getPlugin(context);
-
         if(obj != null) {
             return new Templator(obj.html());
         }