diff --git a/modules/universal_table/index.html.erb b/modules/universal_table/index.html.erb
index 0ab2999..c188ce6 100755
--- a/modules/universal_table/index.html.erb
+++ b/modules/universal_table/index.html.erb
@@ -48,6 +48,7 @@
       width: 120px;
     }
   </style>
+  <form class="form-inline universal-form-inline" action="{{url}}" method="get">
   <table class="table table-hover table-striped universal-table-index">
     <caption>
       <h3>{{table-name}}</h3>
@@ -64,13 +65,10 @@
               <span class="caret"></span>
             </button>
             <div class="dropdown-menu universal-dropdown-menu" aria-labelledby="dLabel">
-              <form class="form-inline universal-form-inline" action="{{url}}" method="get">
-                <div class="form-group">
-                  {{form-field}}
-                  <input type="hidden" value="{{key}}" name="column" >
-                </div>
-                <button class="btn btn-primary" type="submit" class="btn btn-default">Go</button>
-              </form>
+              <div class="form-group">
+                {{form-field}}
+              </div>
+              <button class="btn btn-primary" type="submit" class="btn btn-default">Go</button>
             </div>
           </div>
         </th>
@@ -82,10 +80,11 @@
       </tr>
     </tbody>
   </table>
+  </form>
   <div>{{total_entries}}</div>
   <div>{{export_button}}</div>
   {{pagination_goes_here}}
-<script>
+<script type="text/javascript">
   $('.universal-table-index th').eq(1).attr('class', 'desktop tablet-l tablet-p');
   $('.universal-table-index th').filter(':gt(1)').attr('class', 'desktop tablet-l tablet-p mobile-l');
   $('.universal-table-index').each(function(){
@@ -101,6 +100,9 @@
       });
     }
   });
+  $(document).on('click', '.universal-table-index .dropdown-menu', function (e) {
+    e.stopPropagation();
+  });
 </script>
 <style>
   .universal-table-index.dtr-inline.collapsed td.dtr-control{
diff --git a/modules/universal_table/index2.html.erb b/modules/universal_table/index2.html.erb
index bd99c6b..b058544 100755
--- a/modules/universal_table/index2.html.erb
+++ b/modules/universal_table/index2.html.erb
@@ -7,10 +7,11 @@
       padding: 8px 0 0 0;
       display: inline;
       margin-right: 5px;
-      color: #888;
+      color: #fff;
     }
     .universal-dropdown {
       display: inline-block;
+      color: gray;
     }
     a.universal-btn {
       vertical-align: baseline;
@@ -36,26 +37,14 @@
     .universal-table-index tbody {
        counter-reset: item;
     }
-
-    .universal-table-index tbody > tr > td:first-child:before {
-       content: counter(item);
-       counter-increment: item;
-    }
-
-    
-    .universal-table-index thead > tr > th:first-child:before {
-       content: "No.";
-    }
-
     .universal-table-index thead > tr > th:first-child {
        width: 4em;
     }
-
     .universal-th-icon {
       border: 1px solid #eee;
       padding: 5px 8px;
       margin-right: 5px;
-      color: gray;
+      color: #fff;
       cursor: pointer;
     }
     .universal-th-text.no-sort.no-search {
@@ -102,7 +91,9 @@
   <div>{{total_entries}}</div>
   <div>{{export_button}}</div>
   {{pagination_goes_here}}
-<script>
-	$('.universal-table-index thead tr').prepend('<th></th>')
-	$('.universal-table-index tbody tr').prepend('<td></td>')
-</script>
+
+  <script type="text/javascript">
+    $(document).on('click', '.universal-table-index .dropdown-menu', function (e) {
+      e.stopPropagation();
+    });
+  </script>
\ No newline at end of file