diff --git a/public/js/UnleashApp.jsx b/public/js/UnleashApp.jsx
new file mode 100644
index 0000000000..3690e0cb61
--- /dev/null
+++ b/public/js/UnleashApp.jsx
@@ -0,0 +1,62 @@
+var React                   = require('react');
+var TabView                 = require('./components/TabView');
+var Menu                    = require('./components/Menu');
+var UserStore               = require('./stores/UserStore');
+var ErrorMessages           = require('./components/ErrorMessages');
+var LogEntriesComponent     = React.createFactory(require('./components/log/LogEntriesComponent'));
+var FeatureTogglesComponent = React.createFactory(require('./components/feature/FeatureTogglesComponent'));
+var StrategiesComponent     = React.createFactory(require('./components/strategy/StrategiesComponent'));
+var ArchiveFeatureComponent = React.createFactory(require('./components/feature/ArchiveFeatureComponent'));
+
+UserStore.init();
+
+var tabPanes = [
+{
+    name: 'Feature Toggles',
+    slug: 'feature-toggles',
+    content: new FeatureTogglesComponent({})
+},
+{
+    name: 'Strategies',
+    slug: 'strategies',
+    content: new StrategiesComponent({})
+},
+{
+    name: "Log",
+    slug: 'log',
+    content: new LogEntriesComponent({})
+},
+{
+    name: "Archive",
+    slug: 'archive',
+    content: new ArchiveFeatureComponent({})
+}
+];
+
+
+var UnleashApp = React.createClass({
+    getInitialState: function() {
+        return {
+            featureToggles: [],
+            archivedToggles: [],
+            strategies: []
+
+        };
+    },
+
+    render: function () {
+        return (
+            <div>
+                <Menu />
+                <div className="container">
+                    <div className="page">
+                        <ErrorMessages />
+                        <TabView tabPanes={tabPanes} />
+                    </div>
+                </div>
+            </div>
+        );
+    }
+});
+
+module.exports = UnleashApp;
diff --git a/public/js/app.jsx b/public/js/app.jsx
index 276e6b701c..4cf42046b0 100644
--- a/public/js/app.jsx
+++ b/public/js/app.jsx
@@ -1,47 +1,3 @@
-var React                   = require('react');
-var TabView                 = require('./components/TabView');
-var Menu                    = require('./components/Menu');
-var UserStore               = require('./stores/UserStore');
-var ErrorMessages           = require('./components/ErrorMessages');
-var LogEntriesComponent     = React.createFactory(require('./components/log/LogEntriesComponent'));
-var FeatureTogglesComponent = React.createFactory(require('./components/feature/FeatureTogglesComponent'));
-var StrategiesComponent     = React.createFactory(require('./components/strategy/StrategiesComponent'));
-var ArchiveFeatureComponent = React.createFactory(require('./components/feature/ArchiveFeatureComponent'));
-
-UserStore.init();
-
-var tabPanes = [
-    {
-        name: 'Feature Toggles',
-        slug: 'feature-toggles',
-        content: new FeatureTogglesComponent({pollInterval: 5000})
-    },
-    {
-        name: 'Strategies',
-        slug: 'strategies',
-        content: new StrategiesComponent({})
-    },
-    {
-        name: "Log",
-        slug: 'log',
-        content: new LogEntriesComponent({})
-    },
-    {
-        name: "Archive",
-        slug: 'archive',
-        content: new ArchiveFeatureComponent({})
-    }
-];
-
-React.render(
-    <div>
-        <Menu />
-        <div className="container">
-            <div className="page">
-                <ErrorMessages />
-                <TabView tabPanes={tabPanes} />
-            </div>
-        </div>
-    </div>,
-    document.getElementById('content')
-);
+var React = require('react');
+var UnleashApp = require('./UnleashApp');
+React.render(<UnleashApp />, document.getElementById('content'));