2 files changed, 6 insertions, 22 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 0df286c26..81d080801 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -266,10 +266,13 @@ $(document).ready(function(){
     });
     $("a.async-link").click(manage_async_link);
     $(".chosen-select").chosen();
-    $(".clear-search").click(function(){
+    $("#clear-search-button").click(function(){
         $(this).parent().parent().children('input').prop("value", "");
         enable_save();
     });
+    $("#submit-search").click(function(){
+        $(".search_button").click();
+    });
 });
 
 $(document).on("click", '#to_bottom_arrow', function(){
@@ -540,8 +543,10 @@ function get_label_from_input(input){
 var enable_save = function(){
     if ($(".search-widget input").val()){
         $("#save-search-button").removeClass('disabled');
+        $("#clear-search-button").removeClass('disabled');
     } else {
         $("#save-search-button").addClass('disabled');
+        $("#clear-search-button").addClass('disabled');
     }
 }
 
diff --git a/ishtar_common/static/media/styles.css b/ishtar_common/static/media/styles.css
index 6860ca93c..b5e8bab48 100644
--- a/ishtar_common/static/media/styles.css
+++ b/ishtar_common/static/media/styles.css
@@ -25,10 +25,6 @@ html{
     height: auto;
 }
 
-.form-group span label {
-    display: inline-block;
-}
-
 
 #window-fixed-menu.hidden #window-fixed-menu-list{
     display: none;
@@ -39,23 +35,6 @@ html{
     font-size: 0.9em;
 }
 
-.form-group label{
-    display: block;
-}
-
-.form-group li label {
-    display: inline-block;
-}
-
-.form-group li .form-control {
-    width: auto;
-}
-
-.form-group li input[type="radio"].form-control,
-.form-group li input[type="checkbox"].form-control{
-    display: inline;
-}
-
 #id_parcel_0, #id_parcel_1, #id_parcel_2{
     width: 30%;
     display: inline-block;