diff --git a/client/js/Ui/argumentspanel.js b/client/js/Ui/argumentspanel.js
index 47d1058b..5bcf32d1 100644
--- a/client/js/Ui/argumentspanel.js
+++ b/client/js/Ui/argumentspanel.js
@@ -4,6 +4,7 @@ SCWeb.ui.ArgumentsPanel = {
     init: function () {
         this.argument_add_state = false;
         var self = this;
+        this._parentContainer = document.getElementById('arguments_container');
         return new Promise((resolve, reject)=>{
 
             // listen events from arguments
@@ -70,7 +71,9 @@ SCWeb.ui.ArgumentsPanel = {
             + idx_str
             + '"></button>';
         $(this._container).append(new_button);
-
+        if(this._parentContainer.classList.contains('display-none')) {
+             this._parentContainer.classList.toggle('display-none');
+        }
         // translate added argument
         SCWeb.core.Translation.translate([argument]).then(function (namesMap) {
 
@@ -87,9 +90,10 @@ SCWeb.ui.ArgumentsPanel = {
     onArgumentRemoved: function (argument, idx) {
 
         $('#argument_' + idx.toString()).remove();
-        // update indicies
+        // update indices
+        let noArguments = true;
         $(this._container + ' [arg_idx]').each(function (index, element) {
-
+            noArguments = false;
             var v = parseInt($(this).attr('arg_idx'));
 
             if (v > idx) {
@@ -98,11 +102,15 @@ SCWeb.ui.ArgumentsPanel = {
                 $(this).attr('id', 'argument_' + v.toString());
             }
         });
+        if (noArguments) {
+            this._parentContainer.classList.toggle('display-none');
+        }
     },
 
     onArgumentsCleared: function () {
 
         $(this._container).empty();
+        this._parentContainer.classList.toggle('display-none');
     },
 
     // ------- Translation listener interface ---------
@@ -123,4 +131,4 @@ SCWeb.ui.ArgumentsPanel = {
         return SCWeb.core.Arguments._arguments;
     }
 
-};
+};
\ No newline at end of file
diff --git a/client/static/components/css/common.css b/client/static/components/css/common.css
index 57bbbffe..4586b920 100644
--- a/client/static/components/css/common.css
+++ b/client/static/components/css/common.css
@@ -153,7 +153,7 @@ div#footer {
 }
 
 .argument-container {
-    float: left;
+    display: flex;
     margin: 8px 0 0 8px;
 }
 
@@ -162,7 +162,10 @@ div#footer {
 }
 
 .argument-buttons {
+    display: flex;
     margin-top: 2px;
+    margin-left: 1rem;
+    overflow-x: scroll;
 }
 
 .argument-translate-state {
diff --git a/client/templates/base.html b/client/templates/base.html
index bafa4c38..76585441 100644
--- a/client/templates/base.html
+++ b/client/templates/base.html
@@ -148,18 +148,19 @@ <h1>IMS<small>OSTIS</small></h1>
         <div id="window-container" class="col-xs-10 col-sm-10 col-md-10">{# Windows will be added later #}</div>
     </div>
 
+    <div id="arguments_container" class="argument-container">
+        <div class="btn-group display-none" id="arguments-btn-group">
+            <button id="arguments_clear_button" class="btn btn-danger" sc_control_sys_idtf="ui_control_argument_button_clear"><span class="glyphicon glyphicon-remove-sign"></span></button>
+            <!--<button id="arguments_add_button" class="btn btn-success" {#sc_control_sys_idtf="ui_control_argument_button_add"#}><span class="glyphicon glyphicon-plus-sign"></span></button>-->
+        </div>
+        
+        <div id="arguments_buttons" class="btn-group argument-buttons">
+            <!-- Buttons will be inserted on arguments append -->
+        </div>
+    </div>
+
     <div id="footer" class="navbar navbar-default navbar-fixed-bottom">
         <div class="navbar-inner">
-            <div id="arguments_container" class="argument-container">
-                <div class="btn-group">
-                    <button id="arguments_clear_button" class="btn btn-danger" sc_control_sys_idtf="ui_control_argument_button_clear"><span class="glyphicon glyphicon-remove-sign"></span></button>
-                    <!--<button id="arguments_add_button" class="btn btn-success" {#sc_control_sys_idtf="ui_control_argument_button_add"#}><span class="glyphicon glyphicon-plus-sign"></span></button>-->
-                </div>
-                
-                <div id="arguments_buttons" class="btn-group argument-buttons">
-                    <!-- Buttons will be inserted on arguments append -->
-                </div>
-            </div>
             <span class="copyright"></span>
         </div>
     </div>
@@ -192,7 +193,10 @@ <h1>IMS<small>OSTIS</small></h1>
             });
         });
 
-
+	
+        setTimeout(() => {
+            document.getElementById('arguments-btn-group').classList.toggle('display-none');
+        }, 500);
     </script>