diff --git a/public/css/unleash.css b/public/css/unleash.css
index 62e01e0b91..bb9bd4d8e3 100644
--- a/public/css/unleash.css
+++ b/public/css/unleash.css
@@ -13,4 +13,8 @@
     border-radius: 50%;
     width: 20px;
     height: 20px;
+}
+
+.no-border {
+    border: none;
 }
\ No newline at end of file
diff --git a/public/js/components/feature/Feature.jsx b/public/js/components/feature/Feature.jsx
index 580d6351d8..b29bbc9b75 100644
--- a/public/js/components/feature/Feature.jsx
+++ b/public/js/components/feature/Feature.jsx
@@ -33,14 +33,11 @@ var Feature = React.createClass({
         this.toggleEditMode();
     },
 
-    render: function() {
-        return this.state.editMode ? this.renderEditMode() : this.renderViewMode();
-    },
 
     renderEditMode: function() {
         return (
             <tr>
-                <td colSpan="5">
+                <td colSpan="5" className="pan man no-border">
                     <FeatureForm feature={this.props.feature} onSubmit={this.saveFeature} onCancel={this.toggleEditMode} />
                 </td>
             </tr>
@@ -48,10 +45,10 @@ var Feature = React.createClass({
 
     },
 
-    renderViewMode: function() {
+    render: function() {
         return (
             <tbody>
-                <tr>
+                <tr className={this.state.editMode ? "edit bg-lilac-xlt" : ""}>
                     <td width="20">
                         <span className={this.props.feature.enabled ? "toggle-active" : "toggle-inactive"} title="Status">
                         </span>
@@ -71,18 +68,19 @@ var Feature = React.createClass({
                     <td width="100">
                         <div className="line">
                             <div className="unit size1of2">
-                                <button className="mrs mbs" type='button' title='Edit' onClick={this.toggleEditMode}>
+                                <button className={this.state.editMode ? "primary" : ""} title='Edit' onClick={this.toggleEditMode}>
                                     <span className="icon-redigere" />
                                 </button>
                             </div>
                             <div className="unit size1of2">
-                                <button type='button' title='History' onClick={this.toggleHistory}>
+                                <button className={this.state.showHistory ? "primary" : ""} title='History' onClick={this.toggleHistory}>
                                     <span className="icon-visning_liste" />
                                 </button>
                             </div>
                         </div>
                     </td>
                 </tr>
+                {this.state.editMode ? this.renderEditMode() : this.renderEmptyRow()}
                 {this.state.showHistory ? this.renderHistory() : this.renderEmptyRow()}
             </tbody>
         );
@@ -94,7 +92,9 @@ var Feature = React.createClass({
 
     renderHistory: function() {
         return (<tr>
-                    <td colSpan="5"><LogEntryList events={this.state.events} /></td>
+                    <td colSpan="5" className="pan man no-border">
+                        <LogEntryList events={this.state.events} />
+                    </td>
                 </tr>);
     }
 
diff --git a/public/js/components/feature/FeatureForm.jsx b/public/js/components/feature/FeatureForm.jsx
index 472d5831a5..b840e9fddc 100644
--- a/public/js/components/feature/FeatureForm.jsx
+++ b/public/js/components/feature/FeatureForm.jsx
@@ -23,7 +23,7 @@ var FeatureForm = React.createClass({
           enabled: false
         };
 
-        var title = this.props.feature ? "Edit '" + this.props.feature.name + "'" : "Create new toggle";
+        var title = this.props.feature ? "" : "Create new toggle";
 
         return (
             <div className="bg-lilac-xlt r-pam">
diff --git a/public/js/components/log/LogEntryList.jsx b/public/js/components/log/LogEntryList.jsx
index f2bf3a48c2..50e67e1d7b 100644
--- a/public/js/components/log/LogEntryList.jsx
+++ b/public/js/components/log/LogEntryList.jsx
@@ -12,7 +12,7 @@ var LogEntryList = React.createClass({
         });
         return (
             <div className='r-margin'>
-                <table className='outerborder'>
+                <table className='condensed outerborder zebra-striped'>
                     <thead>
                         <tr>
                             <th>When</th>