diff --git a/client/html/index.html b/client/html/index.html
index b7d5a70..c44136d 100644
--- a/client/html/index.html
+++ b/client/html/index.html
@@ -13,40 +13,26 @@
                 <h1><img id="spinner" alt="loading" class="pull-right" src="images/spinner.gif" style="display: none;" width="32" height="32">Reactive Search</h1>
             </div>
 
-            <!-- query input -->
-            <div class="form-horizontal">
-                <div class="form-group">
-                    <label for="searchKeyword" class="col-md-2 control-label">Keywords</label>
-                    <div class="col-md-10">
-                        <select id="searchKeyword" class="form-control"></select>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="minScore" class="col-md-2 control-label">Minimum score</label>
-                    <div class="col-md-10">
-                        <input class="form-control" type="number" step="any" value="0.25" id="minScore">
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="hintSteps" class="col-md-2 control-label">Hint steps</label>
-                    <div class="col-md-10">
-                        <input class="form-control" type="number" value="20" id="hintSteps">
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="maxResults" class="col-md-2 control-label">Max results</label>
-                    <div class="col-md-10">
-                        <input class="form-control" type="number" value="100" id="maxResults">
-                    </div>
-                </div>
-            </div>
-
             <!-- options dialog -->
             <div class="modal fade" id="optionsDialog" tabindex="-1">
                 <div class="modal-dialog modal-sm">
                     <div class="modal-content">
-                        <div class="modal-header"><big>Visualization Options</big></div>
+                        <div class="modal-header">
+                            <big>Options</big>
+                        </div>
                         <div class="modal-body">
+                            <div class="form-group">
+                                <label for="minScore">Minimum score</label>
+                                <input class="form-control" type="number" step="any" value="0.25" id="minScore">
+                            </div>
+                            <div class="form-group">
+                                <label for="hintSteps">Hint steps</label>
+                                <input class="form-control" type="number" value="20" id="hintSteps">
+                            </div>
+                            <div class="form-group">
+                                <label for="maxResults">Max results</label>
+                                <input class="form-control" type="number" value="100" id="maxResults">
+                            </div>
                             <div class="checkbox">
                                 <label><input type="checkbox" id="useLocalScale" checked="checked">Use local scale</label>
                             </div>
@@ -61,52 +47,64 @@
                 </div>
             </div>
 
-            <!-- query output -->
-            <div>
-                <!-- semantic tweaker -->
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <big>Semantic tweaker</big>
-                        <div class="btn-group pull-right">
-                            <button class="btn btn-xs btn-default" data-toggle="modal" data-target="#optionsDialog">Options</button>
-                        </div>
-                    </div>
-                    <div style="padding: 10px;">
-                        <svg id="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="500"></svg>
-                        <div class="text-center" style="display: none;">
-                            <input id="history" style="width: 90%;" type="text" data-slider-reversed="true" data-slider-max="0">
-                        </div>
+            <!-- query input -->
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <big>Query</big>
+                    <div class="btn-group pull-right">
+                        <button class="btn btn-xs btn-default" data-toggle="modal" data-target="#optionsDialog">Options</button>
                     </div>
                 </div>
-
-                <!-- result listing -->
-                <div class="panel panel-default">
-                    <div class="panel-heading"><big>Query results (<span id="count"></span>)</big></div>
-                    <div style="padding: 10px;">
-                        <script id="template" type="text/x-handlers-template">
-                            {{#if results}}
-                            <table class="table table-striped table-condensed">
-                            <thead>
-                                <tr>
-                                    <th>Id</th>
-                                    <th>Name</th>
-                                    <th>Score</th>
-                                </tr>
-                            </thead>
-                            {{#each results}}
-                                <tr>
-                                    <td>{{id}}</td>
-                                    <td><a href="{{url}}">{{name}}</a></td>
-                                    <td>{{score}}</td>
-                                </tr>
-                            {{/each}}
-                            </table>
-                            {{/if}}
-                        </script>
-                        <div id="results"></div>
+                <div class="panel-body">
+                    <div class="form-group">
+                        <label for="searchKeyword">Keywords</label>
+                        <select id="searchKeyword" class="form-control"></select>
                     </div>
                 </div>
             </div>
+
+            <!-- semantic tweaker -->
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <big>Semantic tweaker</big>
+                </div>
+                <div class="panel-body">
+                    <svg id="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="800" height="500"></svg>
+                    <div class="text-center" style="display: none;">
+                        <input id="history" style="width: 90%;" type="text" data-slider-reversed="true" data-slider-max="0">
+                    </div>
+                </div>
+            </div>
+
+            <!-- result listing -->
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <big>Query results (<span id="count"></span>)</big>
+                </div>
+                <div class="panel-body">
+                    <script id="template" type="text/x-handlers-template">
+                        {{#if results}}
+                        <table class="table table-striped table-condensed">
+                        <thead>
+                            <tr>
+                                <th>Id</th>
+                                <th>Name</th>
+                                <th>Score</th>
+                            </tr>
+                        </thead>
+                        {{#each results}}
+                            <tr>
+                                <td>{{id}}</td>
+                                <td><a href="{{url}}">{{name}}</a></td>
+                                <td>{{score}}</td>
+                            </tr>
+                        {{/each}}
+                        </table>
+                        {{/if}}
+                    </script>
+                    <div id="results"></div>
+                </div>
+            </div>
         </div>
         <!-- inject:js -->
         <!-- endinject -->