diff --git a/web/static/css/graph.css b/web/static/css/graph.css
index 8e32b7e2f..105ad694b 100644
--- a/web/static/css/graph.css
+++ b/web/static/css/graph.css
@@ -207,7 +207,11 @@ input[name="end_input"], input[name="range_input"] {
   margin: 2px;
 }
 
-.btn {
+.btn, .form-control {
+  border-radius: 0;
+}
+
+.square_corners {
   border-radius: 0;
 }
 
diff --git a/web/static/js/graph_template.handlebar b/web/static/js/graph_template.handlebar
index b610c22db..c9523202b 100644
--- a/web/static/js/graph_template.handlebar
+++ b/web/static/js/graph_template.handlebar
@@ -1,6 +1,6 @@
         <div id="graph_wrapper{{id}}" class="graph_wrapper">
           <form action="/api/query_range" method="GET" class="query_form form-inline">
-            <div class="grouping_box">
+            <div class="grouping_box square_corners">
               <div class="head">
                 <div class="form-group">
                   <span class="input-group">
@@ -24,10 +24,10 @@
               TODO: Convert this to Bootstrap navbar.  This requires Javascript
                     refresh.
               -->
-            <div class="grouping_box tabs">
-              <ul>
-                <li><a href="#graph{{id}}">Graph</a></li>
-                <li><a href="#console{{id}}">Tabular</a></li>
+            <div class="grouping_box tabs square_corners">
+              <ul class="square_corners">
+                <li class="square_corners"><a href="#graph{{id}}">Graph</a></li>
+                <li class="square_corners"><a href="#console{{id}}">Tabular</a></li>
               </ul>
               <div id="graph{{id}}" class="graph_container reload">
                 <div>
@@ -89,7 +89,6 @@
                     </button>
                   </div>
 
-
                   <div class="prometheus_input_group">
                     <input class="input" title="Resolution in seconds" placeholder="Res. (s)" type="text" name="step_input" id="step_input{{id}}" value="{{step_input}}" size="6">
                     <input type="hidden" name="step">