diff --git a/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php b/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
index d4692c8c8..675efa98d 100644
--- a/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
+++ b/admin/survey/modules/mod_KOLEKTOR/class.Kolektor.php
@@ -36,6 +36,7 @@ class Kolektor {
             $sql = sisplet_query("SELECT sr.*, s.survey_sequence 
                                     FROM kolektor_survey s, kolektor_survey_response sr 
                                     WHERE s.ank_id=sr.ank_id
+                                    ORDER BY sr.insert_time DESC
                                 ");
 
             while($row = mysqli_fetch_array($sql)){
@@ -47,6 +48,7 @@ class Kolektor {
             $sql = sisplet_query("SELECT sr.*, s.survey_sequence 
                                     FROM kolektor_survey s, kolektor_survey_response sr 
                                     WHERE sr.usr_id='".$global_user_id."' AND s.ank_id=sr.ank_id
+                                    ORDER BY sr.insert_time DESC
                                 ");
 
             while($row = mysqli_fetch_array($sql)){
@@ -61,10 +63,10 @@ class Kolektor {
         
         $data = array();
 
-        $sql = sisplet_query("SELECT ks.*, a.hash, a.naslov, a.akronim FROM kolektor_survey ks, srv_anketa a WHERE a.id=ks.ank_id");
+        $sql = sisplet_query("SELECT ks.*, a.hash, a.naslov, a.akronim FROM kolektor_survey ks, srv_anketa a WHERE a.id=ks.ank_id ORDER BY ks.survey_sequence ASC");
 
         while($row = mysqli_fetch_array($sql)){
-            $data[$row['id']] = $row;
+            $data[$row['ank_id']] = $row;
         }
 
         return $data;
@@ -77,41 +79,54 @@ class Kolektor {
         global $site_url;
         global $lang; 
 
-        echo 'KOLEKTOR';
-
-        echo '<div id="kolektor_add_response">';
-        $this->displayAddResponse();
-        echo '</div>';
+        echo '<button class="medium blue" onClick="createKolektorResponsePopup();">Proži novo anketo</button>';
 
+        echo '<div id="kolektor_reponses_holder">';
         $this->displayResponses();
+        echo '</div>';
     }
 	
 
     public function displayResponses(){
-
-        echo '<div class="kolektor_reponses_holder">';
         
-        echo '  <div class="kolektor_reponses">';
+        echo '  <table class="kolektor_reponses">';
+
+        echo '  <tr>';
+        echo '      <th>Anketa</th>';
+        echo '      <th>ID projekta</th>';
+        echo '      <th>Email respondenta</th>';
+        echo '      <th>Funkcija respondenta</th>';
+        echo '      <th>Čas proženja</th>';
+        echo '      <th>Status</th>';
+        echo '      <th></th>';
+        echo '  </tr>';
 
         // Loop cez vse stranke
         $responses = $this->getResponses();
-        foreach($responses as $reponse_id => $reponse){
+        $surveys = $this->getSurveys();
+        foreach($responses as $response_id => $response){
             
-            echo '  <div class="kolektor_response">';
-            
-            var_dump($reponse);
-            
-            echo '  </div>';
+            echo '  <tr class="kolektor_response">';
+            echo '      <td>'.$surveys[$response['ank_id']]['naslov'].'</td>';
+            echo '      <td>'.$response['respondent_projekt_id'].'</td>';
+            echo '      <td>'.$response['respondent_email'].'</td>';
+            echo '      <td>'.$response['respondent_funkcija'].'</td>';
+            echo '      <td>'.date('j.n.Y H:i:s', strtotime($response['insert_time'])).'</td>';
+            echo '      <td>'.$response['status'].'</td>';
+            echo '      <td>Pošlji opomnik</td>';
+            echo '  </tr>';
         }
         
-        echo '  </div>';
-        
-        echo '</div>';
+        echo '  </table>';
     }
 
     // Prikaze formo za dodajanje novega responsa
 	public function displayAddResponse($data=array(), $error=array()){
 
+        echo '<div class="popup_close"><a href="#" onclick="createKolektorResponseClose();">✕</a></div>';
+
+        echo '<h2>Dodajanje novega respondenta</h2>';
+
         echo '<form id="kolektor_add_response_form" name="kolektor_add_response_form">';
 
 
@@ -183,9 +198,12 @@ class Kolektor {
         echo '</div>';
         
         
-        // Gumb ustvari
-        echo '<button class="medium blue" type="button" onClick="createKolektorResponse();">Sproži anketo in pošlji email respondentu</button>';
-        
+        // Gumbi
+        echo '<div class="button_holder">';
+        echo '  <button class="medium white-blue" type="button" onClick="createKolektorResponseClose();">Zapri</button>';
+        echo '  <button class="medium blue" type="button" onClick="createKolektorResponse();">Sproži anketo in pošlji email respondentu</button>';
+        echo '</div>';
+
 
         echo '</form>';
     }
@@ -204,7 +222,13 @@ class Kolektor {
 		global $global_user_id;
 		
 
-		if($_GET['a'] == 'add_repsonse'){
+        if($_GET['a'] == 'add_repsonse_popup'){
+
+            echo '<div id="kolektor_add_response">';
+            $this->displayAddResponse();
+            echo '</div>';
+        }
+		elseif($_GET['a'] == 'add_repsonse'){
 			
 			$response_data['ank_id'] = (isset($_POST['kolektor_survey'])) ? $_POST['kolektor_survey'] : '';
 			$response_data['respondent_email'] = (isset($_POST['respondent_email'])) ? $_POST['respondent_email'] : '';
diff --git a/admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php b/admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php
index 2d030b361..3f2141e4e 100644
--- a/admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php
+++ b/admin/survey/modules/mod_KOLEKTOR/class.KolektorResponse.php
@@ -73,7 +73,18 @@ class KolektorResponse {
         $response_id = mysqli_insert_id($GLOBALS['connect_db']);
 
         if($response = new KolektorResponse($response_id)){
-            echo 'Anketa je bila uspešno sprožena in email je bil uspešno poslan respondentu ('.$response_data['respondent_email'].').';
+
+            echo '<div class="popup_close"><a href="#" onclick="window.location.reload();">✕</a></div>';
+
+            echo '<h2>Dodajanje novega respondenta</h2>';
+
+            echo 'Anketa uspešno sprožena in email uspešno poslan respondentu ('.$response_data['respondent_email'].').';
+
+            // Gumb koncaj
+            echo '<div class="button_holder">';
+            echo '  <button class="medium white-blue" type="button" onClick="window.location.reload();">Zapri</button>';
+            echo '</div>';
+
             return $response;
         }
         else{
diff --git a/admin/survey/modules/mod_KOLEKTOR/script/script.js b/admin/survey/modules/mod_KOLEKTOR/script/script.js
index 535d6cfb9..fc44db0d8 100644
--- a/admin/survey/modules/mod_KOLEKTOR/script/script.js
+++ b/admin/survey/modules/mod_KOLEKTOR/script/script.js
@@ -1,4 +1,20 @@
 
+function createKolektorResponsePopup(){
+
+    $("#fullscreen").addClass('PopUpNarrow').addClass('divPopUp');
+	$("#fullscreen").load('ajax.php?t=kolektor&a=add_repsonse_popup', function() {
+
+		$('#fade').fadeTo('slow', 1);
+		$('#fullscreen').show();
+	});
+}
+
+function createKolektorResponseClose(){
+
+    $('#fade').fadeOut('slow');
+	$('#fullscreen').fadeOut('slow').html('');
+}
+
 function createKolektorResponse(){
 
     var form = $("#kolektor_add_response_form").serializeArray();