diff --git a/src/core/client/admin/components/App.tsx b/src/core/client/admin/components/App.tsx
index 1cefa80b6..c0c061fea 100644
--- a/src/core/client/admin/components/App.tsx
+++ b/src/core/client/admin/components/App.tsx
@@ -2,36 +2,10 @@ import React, { StatelessComponent } from "react";
 import { HorizontalGutter } from "talk-ui/components";
 import NavigationContainer from "../containers/NavigationContainer";
 
-export type View =
-  | "MODERATE"
-  | "COMMUNITY"
-  | "STORIES"
-  | "CONFIGURE"
-  | "%future added value";
-
-export interface AppProps {
-  view: View;
-}
-
-const renderView = (view: View) => {
-  switch (view) {
-    case "MODERATE":
-      return <div>MODERATE</div>;
-    case "COMMUNITY":
-      return <div>COMMUNITY</div>;
-    case "STORIES":
-      return <div>STORIES</div>;
-    case "CONFIGURE":
-      return <div>CONFIGURE</div>;
-    default:
-      throw new Error(`Unknown view ${view}`);
-  }
-};
-
-const App: StatelessComponent<AppProps> = ({ view }) => (
+const App: StatelessComponent = ({ children }) => (
   <HorizontalGutter>
     <NavigationContainer />
-    {renderView(view)}
+    {children}
   </HorizontalGutter>
 );
 
diff --git a/src/core/client/admin/containers/AppContainer.tsx b/src/core/client/admin/containers/AppContainer.tsx
deleted file mode 100644
index f96fa16f6..000000000
--- a/src/core/client/admin/containers/AppContainer.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import * as React from "react";
-import { StatelessComponent } from "react";
-
-import { AppContainerLocal as Local } from "talk-admin/__generated__/AppContainerLocal.graphql";
-import { graphql, withLocalStateContainer } from "talk-framework/lib/relay";
-
-import App from "../components/App";
-
-interface InnerProps {
-  local: Local;
-}
-
-const AppContainer: StatelessComponent<InnerProps> = ({ local: { view } }) => {
-  return <App view={view} />;
-};
-
-const enhanced = withLocalStateContainer(
-  graphql`
-    fragment AppContainerLocal on Local {
-      view
-    }
-  `
-)(AppContainer);
-
-export default enhanced;
diff --git a/src/core/client/admin/index.tsx b/src/core/client/admin/index.tsx
index 2d5bbc569..efa04ac7d 100644
--- a/src/core/client/admin/index.tsx
+++ b/src/core/client/admin/index.tsx
@@ -9,7 +9,7 @@ import ReactDOM from "react-dom";
 import { createManaged } from "talk-framework/lib/bootstrap";
 
 import { TalkContextConsumer } from "talk-framework/lib/bootstrap/TalkContext";
-import AppContainer from "./containers/AppContainer";
+import App from "./components/App";
 import { initLocalState } from "./local";
 import localesData from "./locales";
 
@@ -23,7 +23,7 @@ async function main() {
   const Router = createFarceRouter({
     historyProtocol: new BrowserProtocol(),
     historyMiddlewares: [queryMiddleware],
-    routeConfig: makeRouteConfig(<Route path="/" Component={AppContainer} />),
+    routeConfig: makeRouteConfig(<Route path="/" Component={App} />),
     render: createRender({}),
   });
 
diff --git a/src/core/server/app/router.ts b/src/core/server/app/router.ts
index d68bcc2b8..df0d94b32 100644
--- a/src/core/server/app/router.ts
+++ b/src/core/server/app/router.ts
@@ -50,9 +50,6 @@ async function createTenantRouter(app: AppOptions, options: RouterOptions) {
   // Setup auth routes.
   router.use("/auth", createNewAuthRouter(app, options));
 
-  // Handle the admin handler.
-  router.get("/admin", adminHandler);
-
   // Tenant API
   router.use(
     "/graphql",
@@ -131,6 +128,9 @@ export async function createRouter(app: AppOptions, options: RouterOptions) {
   // Create a router.
   const router = express.Router();
 
+  // Handle the admin handler.
+  router.get("/admin", adminHandler);
+
   router.use("/api", nocacheMiddleware, await createAPIRouter(app, options));
 
   if (app.config.get("env") === "development") {
diff --git a/src/types/farce.d.ts b/src/types/farce.d.ts
index 9823dcc2a..746415c18 100644
--- a/src/types/farce.d.ts
+++ b/src/types/farce.d.ts
@@ -1,3 +1,4 @@
 declare module "farce" {
-
+  export class BrowserProtocol {}
+  export class queryMiddleware {}
 }
diff --git a/src/types/found-relay.d.ts b/src/types/found-relay.d.ts
index adcb42b5e..38ce1a505 100644
--- a/src/types/found-relay.d.ts
+++ b/src/types/found-relay.d.ts
@@ -1,3 +1,6 @@
 declare module "found-relay" {
-
+  import { Environment } from "relay-runtime";
+  export class Resolver {
+    constructor(relayEnvironment: Environment);
+  }
 }