diff --git a/admin/survey/classes/class.SurveySkupine.php b/admin/survey/classes/class.SurveySkupine.php
index 94cddfbc0..0dae5131f 100644
--- a/admin/survey/classes/class.SurveySkupine.php
+++ b/admin/survey/classes/class.SurveySkupine.php
@@ -77,18 +77,19 @@ class SurveySkupine {
         else{
 			echo '<div class="setting_holder">';
 			echo '<label for="skupina">'.$lang['group_name'].':</label>';
-			echo '<form>';
+			echo '<div class="button_holder inline">';
 			echo '<input type="text" id="skupina" name="skupina" class="large" autocomplete="off" onKeyUp="add_skupina_enter(\'1\', event);" />';
-			echo '<button class="medium blue mleft" onclick="add_skupina(\'1\');">'.$lang['add'].'</button>';
-			echo '</form>';
+			echo '<button class="medium blue" onclick="add_skupina(\'1\');">'.$lang['add'].'</button>';
 			echo '</div>';
+			echo '</div>';
+
         }
 
 		if($spr_id != 0){
 
 			// izpis skupin za anketo
 			$vrednosti = $this->getVrednosti($spr_id);
-			echo '<table>';
+			echo '<table id="groups_table">';
 
 			echo '<tr>';
 			echo '<th></th>';
@@ -108,7 +109,7 @@ class SurveySkupine {
 					$link = $vrednost['nice_url'];
 			echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
 			
-			echo '<td class="right">300</td>';
+			echo '<td class="right">42 - temp</td>';
 
 			echo '</tr>';
 			}
@@ -318,18 +319,17 @@ class SurveySkupine {
                 }
 
 
-                // Vrnemo novo geslo, ki ga vstavimo v html
-                echo '<p>';
-
-                echo '<strong>'.stripslashes($naslov_vrednost).'</strong>';
+                // Vrnemo novo geslo, ki ga vstavimo v html - POPRAVIT ZA INSERT V TABELO
+                echo '<tr>';
+				echo '<td><a><span class="faicon trash empty" onclick="delete_skupina(\''.$skupine.'\', \''.$vre_id.'\');"></span></a></td>';
+				echo '<td>'.stripslashes($naslov_vrednost).'</td>';
                 if($skupine == 1){
                     $link = $this->getUrl($spr_id, $vre_id);
-                    echo ' (<a href="'.$link.'" target="_blank" title="URL skupine '.stripslashes($naslov_vrednost).'">'.$link.'</a>)';
+					echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.stripslashes($naslov_vrednost).'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
                 }
+				echo '<td class="right">42 - temp</td>';
 
-                echo '<span class="faicon delete_circle icon-orange_link spaceLeft" style="margin-bottom:1px;" onclick="delete_skupina(\''.$skupine.'\', \''.$vre_id.'\');"></span>';		
-                
-                echo '</p>';
+                echo '</tr>';
             }
 		}
 		
diff --git a/admin/survey/script/skupine.js b/admin/survey/script/skupine.js
index 665434099..5371400db 100644
--- a/admin/survey/script/skupine.js
+++ b/admin/survey/script/skupine.js
@@ -5,8 +5,8 @@ function add_skupina(skupine){
 	var text = $('input[name=skupina]').val();
 	
 	$.post('ajax.php?t=skupine&a=add_skupina', {anketa: srv_meta_anketa_id, spr_id:spr_id, text:text, skupine:skupine}, function(response){
-		//window.location.reload();
-		$(response).insertBefore('.add_skupina_button');
+		window.location.reload();
+		$('#groups_table tr:last').after(response);
 		$('input[name=skupina]').val('').focus();
 	});
 }
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 8c8f3fdfe..5dcb15294 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5354,11 +5354,6 @@ button.red:hover,
 submit.red:hover {
   background-color: #e60000;
 }
-button.mleft,
-submit.mleft {
-  margin-left: 16px;
-  margin-bottom: 32px;
-}
 
 div.button_holder {
   display: flex;
@@ -5369,6 +5364,12 @@ div.button_holder {
 div.button_holder button {
   margin-right: 16px;
 }
+div.button_holder.inline {
+  align-items: flex-end;
+}
+div.button_holder.inline button {
+  margin-left: 16px;
+}
 
 label {
   cursor: pointer;
diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss
index f9327473c..0815a97c0 100644
--- a/resources/sass/admin_new/components/form/button.scss
+++ b/resources/sass/admin_new/components/form/button.scss
@@ -92,11 +92,6 @@ submit{
             background-color: darken($red, 5%);
         }
     }
-
-    &.mleft {
-        margin-left: 16px;
-        margin-bottom: 32px;
-    }
 }
 
 div.button_holder {
@@ -108,4 +103,12 @@ div.button_holder {
     button {
         margin-right: 16px;
     }
+
+    &.inline {
+    align-items: flex-end;
+
+        button {
+            margin-left: 16px;
+        }
+    }
 }
\ No newline at end of file