diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 3e2c859ae..18b7a0302 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -1069,6 +1069,8 @@ class Branching {
                 printf ($lang['srv_new_survey_success3'], 'index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=toolbox&value=3');
                 echo '  </div>';
 
+                MobileSurveyAdmin::displayNoQuestions($this->anketa);
+
 				echo '</li>';
 			}
 
@@ -1102,9 +1104,6 @@ class Branching {
 
 			}
 
-			//$sqlQ = sisplet_query("SELECT * FROM srv_branching WHERE ank_id='$this->anketa' AND parent='0' ORDER BY vrstni_red ASC");
-	        //if (!$sqlQ) echo mysqli_error($GLOBALS['connect_db']);
-	        //while ($rowQ = mysqli_fetch_array($sqlQ)) {
 	        foreach (Cache::srv_branching_parent($this->anketa, $parent) AS $k => $rowQ) {
 	            $this->display_element($rowQ['element_spr'], $rowQ['element_if']);
 	        }
diff --git a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php
index 467ca3622..d68334427 100644
--- a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php
+++ b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php
@@ -695,7 +695,7 @@ class MobileSurveyAdmin{
     public static function displayAddQuestion($ank_id){
         global $lang;
 
-        echo '<div class="mobile_add_question">';
+        echo '<div class="mobile_add_question bottom">';
         echo '  <span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mobile_add_question_popup(); return false;">';
         echo '      <span class="plus">+</span> ';
         echo '      <span>'.$lang['srv_mobile_add_question'].'</span>';
@@ -719,4 +719,19 @@ class MobileSurveyAdmin{
 
         echo '</div>';
     }
+
+    // Div ko se nimamo nobenega vprasanja v anketi
+    public static function displayNoQuestions($ank_id){
+        global $lang;
+
+        // Skrijemo spodnji gumb
+        echo '<style>.mobile_add_question.bottom{display: none;}</style>';
+
+        echo '<div class="mobile_add_question center">';
+        echo '  <span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mobile_add_question_popup(); return false;">';
+        echo '      <span class="plus">+</span> ';
+        echo '      <span>'.$lang['srv_mobile_add_question'].'</span>';
+        echo '  </a></span>';
+        echo '</div>';
+    }
 }
diff --git a/public/css/admin.css b/public/css/admin.css
index 274cf93d1..60fec7c64 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -28510,6 +28510,8 @@ a.addIfIcon {
 @media (max-width: 600px) {
   #main {
     margin-top: 70px;
+    padding-bottom: 30px;
+    /*overflow-x: scroll;*/
   }
   #main #anketa_edit {
     box-sizing: border-box !important;
@@ -28745,6 +28747,7 @@ fieldset textarea {
   #srv_footer {
     display: flex;
     flex-direction: column;
+    margin-top: 0;
   }
   #srv_footer .footer_left {
     margin-bottom: 10px;
@@ -28917,17 +28920,23 @@ table.dashboard > tbody > tr > td {
     display: none !important;
   }
   #branching .empty_vrivanje {
-    padding: 50px 0 !important;
-    margin: 20px 10px 20px 20px !important;
+    padding: 30px 0 !important;
+    margin: 20px 10px 20px 10px !important;
   }
   #branching .empty_vrivanje .empty_vrivanje_title {
+    display: none;
     margin: 0 20px;
     font-size: 14px;
   }
   #branching .empty_vrivanje .empty_vrivanje_subtitle {
+    display: none;
     margin: 15px 20px 0 15px;
     font-size: 13px;
   }
+  #branching .empty_vrivanje .mobile_add_question {
+    position: relative;
+    bottom: auto;
+  }
   #branching #bottom_icons_holder {
     display: flex;
     flex-direction: column;
diff --git a/resources/sass/admin/mobile/basic.scss b/resources/sass/admin/mobile/basic.scss
index 2e7e1a5a6..e8e480a3b 100644
--- a/resources/sass/admin/mobile/basic.scss
+++ b/resources/sass/admin/mobile/basic.scss
@@ -1,5 +1,7 @@
 #main{
     margin-top: 70px;
+    padding-bottom: 30px;
+    /*overflow-x: scroll;*/
 
     #anketa_edit{
         box-sizing: border-box !important;
diff --git a/resources/sass/admin/mobile/footer.scss b/resources/sass/admin/mobile/footer.scss
index 951c2cf60..f8df9da45 100644
--- a/resources/sass/admin/mobile/footer.scss
+++ b/resources/sass/admin/mobile/footer.scss
@@ -2,6 +2,8 @@
     display: flex;
     flex-direction: column;
 
+    margin-top: 0;
+
     .footer_left{
         margin-bottom: 10px;
     }
diff --git a/resources/sass/admin/mobile/pages/branching.scss b/resources/sass/admin/mobile/pages/branching.scss
index c956b31d5..79ef5e4d6 100644
--- a/resources/sass/admin/mobile/pages/branching.scss
+++ b/resources/sass/admin/mobile/pages/branching.scss
@@ -17,17 +17,26 @@
 
     
     .empty_vrivanje {
-        padding: 50px 0 !important;
-        margin: 20px 10px 20px 20px !important;
+        padding: 30px 0 !important;
+        margin: 20px 10px 20px 10px !important;
 
         .empty_vrivanje_title{
+            display: none;
+
             margin: 0 20px;
             font-size: 14px;
         }
         .empty_vrivanje_subtitle{
+            display: none;
+
             margin: 15px 20px 0 15px;
             font-size: 13px;
         }
+
+        .mobile_add_question{
+            position: relative;
+            bottom: auto;
+        }
     }
 
     #bottom_icons_holder{