diff --git a/app/components/RequestPane.js b/app/components/RequestPane.js
index 296775ef3f..1843b3edb1 100644
--- a/app/components/RequestPane.js
+++ b/app/components/RequestPane.js
@@ -56,17 +56,19 @@ class RequestPane extends Component {
             </Tab>
             <Tab>
               <button>
-                Params {request.params.length ? `(${request.params.length})` : ''}
+                Params {request.params.length ? (
+                <span className="txt-sm">({request.params.length})</span> ) : null}
               </button>
             </Tab>
             <Tab>
               <button>
-                Auth {request.authentication.username ? <i className="fa fa-lock"></i> : ''}
+                Auth {request.authentication.username ? <i className="fa fa-lock txt-sm"></i> : ''}
               </button>
             </Tab>
             <Tab>
               <button>
-                Headers {request.headers.length ? `(${request.headers.length})` : ''}
+                Headers {request.headers.length ? (
+                <span className="txt-sm">({request.headers.length})</span> ) : null}
               </button>
             </Tab>
           </TabList>
diff --git a/app/components/ResponsePane.js b/app/components/ResponsePane.js
index aaaf11ba77..d347e11c87 100644
--- a/app/components/ResponsePane.js
+++ b/app/components/ResponsePane.js
@@ -47,7 +47,12 @@ class ResponsePane extends Component {
                 updatePreviewMode={updatePreviewMode}
               />
             </Tab>
-            <Tab><button>Headers</button></Tab>
+            <Tab>
+              <button>
+                Headers {response.headers.length ? (
+                <span className="txt-sm">({response.headers.length})</span> ) : null}
+              </button>
+            </Tab>
           </TabList>
           <TabPanel>
             {response.error ? (
diff --git a/app/containers/App.js b/app/containers/App.js
index 67c4e861e2..76ae83aa3e 100644
--- a/app/containers/App.js
+++ b/app/containers/App.js
@@ -71,9 +71,14 @@ class App extends Component {
         const requestPaneWidth = requestPane.offsetWidth;
         const responsePaneWidth = responsePane.offsetWidth;
         const pixelOffset = e.clientX - requestPane.offsetLeft;
-        const ratio = pixelOffset / (requestPaneWidth + responsePaneWidth);
-        const paneWidth = Math.max(Math.min(ratio, 0.6), 0.4);
-        
+        let paneWidth = pixelOffset / (requestPaneWidth + responsePaneWidth);
+
+        if (paneWidth < 0.1) {
+          paneWidth = 0.01;
+        } else if (paneWidth > 0.9) {
+          paneWidth = 0.99;
+        }
+
         this.setState({paneWidth});
       } else if (this.state.draggingSidebar) {
         this.refs.sidebar.resize(e.clientX);
diff --git a/app/css/layout/base.scss b/app/css/layout/base.scss
index 9921b4aa47..766f20d534 100644
--- a/app/css/layout/base.scss
+++ b/app/css/layout/base.scss
@@ -119,6 +119,10 @@ i.fa {
   white-space: pre-wrap;
 }
 
+.no-wrap {
+  white-space: nowrap;
+}
+
 .pad {
   box-sizing: border-box;
   padding: $padding-md;