diff --git a/frontend/src/component/feature/form/index.jsx b/frontend/src/component/feature/form/index.jsx
index 37f73ab84b..fcc159ee73 100644
--- a/frontend/src/component/feature/form/index.jsx
+++ b/frontend/src/component/feature/form/index.jsx
@@ -45,7 +45,7 @@ class AddFeatureToggleComponent extends Component {
 
         return (
             <form onSubmit={onSubmit(input)}>
-                <HeaderTitle title={title} />
+                {title && <HeaderTitle title={title} />}
                 <section>
                     <Textfield
                         floatingLabel
diff --git a/frontend/src/component/feature/view-edit-container.jsx b/frontend/src/component/feature/view-edit-container.jsx
index d6c9ffad9d..d22753c6fa 100644
--- a/frontend/src/component/feature/view-edit-container.jsx
+++ b/frontend/src/component/feature/view-edit-container.jsx
@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import { Grid, Cell, Icon, ProgressBar, List, ListItem, ListItemContent } from 'react-mdl';
+import { Tabs, Tab, Grid, Cell, Icon, ProgressBar, List, ListItem, ListItemContent } from 'react-mdl';
 import { Link } from 'react-router';
 
 import percentLib from 'percent';
@@ -15,6 +15,12 @@ import { AppsLinkList, SwitchWithLabel, getIcon } from '../common';
 
 class EditFeatureToggleWrapper extends React.Component {
 
+    constructor (props) {
+        super(props);
+
+        this.state = { activeTab: 0 };
+    }
+
     static propTypes () {
         return {
             featureToggleName: PropTypes.string.isRequired,
@@ -66,14 +72,11 @@ class EditFeatureToggleWrapper extends React.Component {
             return <span>Could not find the toggle "{this.props.featureToggleName}"</span>;
         }
 
-        return (
+        const content = this.state.activeTab === 0 ? (
             <div>
-                <h4>{featureToggle.name} <small>{featureToggle.enabled ? 'is enabled' : 'is disabled'}</small></h4>
-                <p>{featureToggle.description}</p>
-                <hr />
                 <SwitchWithLabel
-                    checked={featureToggle.enabled}
-                    onChange={() => toggleFeature(featureToggle)}>Toggle {featureToggle.name}</SwitchWithLabel>
+                checked={featureToggle.enabled}
+                onChange={() => toggleFeature(featureToggle)}>Toggle {featureToggle.name}</SwitchWithLabel>
                 <hr />
                 <Grid style={{ textAlign: 'center' }}>
                     <Cell col={3}>
@@ -121,10 +124,24 @@ class EditFeatureToggleWrapper extends React.Component {
                             </Link>
                     </Cell>
                 </Grid>
+            </div>
+            ) : (
+                <EditFeatureToggle featureToggle={featureToggle} />
+            );
 
-                <hr />
+        return (
+            <div>
+                <h4>{featureToggle.name} <small>{featureToggle.enabled ? 'is enabled' : 'is disabled'}</small></h4>
+                <div>{featureToggle.description}</div>
+                <Tabs activeTab={this.state.activeTab}
+                    onChange={(tabId) => this.setState({ activeTab: tabId })}
+                    ripple
+                    style={{ marginBottom: '10px' }}>
+                    <Tab>Metrics</Tab>
+                    <Tab>Edit</Tab>
+                </Tabs>
 
-                <EditFeatureToggle title="Edit" featureToggle={featureToggle} />
+                {content}
             </div>
         );
     }