diff --git a/app/components/ResponseHeadersViewer.js b/app/components/ResponseHeadersViewer.js
index 2ef20f619..f70bcae7e 100644
--- a/app/components/ResponseHeadersViewer.js
+++ b/app/components/ResponseHeadersViewer.js
@@ -7,9 +7,30 @@ const ResponseHeadersViewer = ({headers}) => {
   ).join('\n');
 
   return (
-    <pre className="scrollable wide tall selectable monospace pad">
-      {headersString}
-    </pre>
+    <div>
+      <table className="wide">
+        <thead>
+        <tr>
+          <th>Name</th>
+          <th>Value</th>
+        </tr>
+        </thead>
+        <tbody>
+        {headers.map((h, i) => (
+          <tr className="selectable" key={i}>
+            <td>{h.name}</td>
+            <td>{h.value}</td>
+          </tr>
+        ))}
+        </tbody>
+      </table>
+      <p className="pad-top">
+        <CopyButton
+          className="pull-right btn btn--super-compact btn--outlined"
+          content={headersString}
+        />
+      </p>
+    </div>
   )
 };
 
diff --git a/app/components/ResponsePane.js b/app/components/ResponsePane.js
index f69c16bf7..43d8f27eb 100644
--- a/app/components/ResponsePane.js
+++ b/app/components/ResponsePane.js
@@ -11,7 +11,6 @@ import {getPreviewModeName} from '../lib/previewModes';
 import {PREVIEW_MODE_SOURCE} from '../lib/previewModes';
 import {REQUEST_TIME_TO_SHOW_COUNTER} from '../lib/constants';
 import {MOD_SYM} from '../lib/constants';
-import RequestSwitcherModal from './modals/RequestSwitcherModal';
 
 class ResponsePane extends Component {
   render () {
@@ -147,7 +146,7 @@ class ResponsePane extends Component {
               />
             )}
           </TabPanel>
-          <TabPanel>
+          <TabPanel className="scrollable pad">
             <ResponseHeadersViewer headers={response.headers}/>
           </TabPanel>
         </Tabs>
diff --git a/scripts/build.sh b/scripts/build.sh
index 458965d7b..3cadf7f43 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -3,6 +3,7 @@
 
 BUILD_DIR='./build'
 
+say "Starting build"
 echo "-- REMOVING DIST FOLDER --"
 rm -r "$BUILD_DIR"
 
@@ -26,3 +27,4 @@ cd "$BUILD_DIR"/
 NODE_ENV=production npm install
 
 echo "-- BUILD COMPLETE --"
+say "Build complete"