diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 9ddb7d52e..02fd02c4b 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -2261,15 +2261,37 @@ class SurveyAdminSettings {
 	}
 	
 	function anketa_nice_links () {
+		global $lang;
 		
 		echo '<div id="anketa_edit">';
+
+		echo '<fieldset><legend>'.$lang['srv_nice_url'].'</legend>';
 		
 		$sql = sisplet_query("SELECT l.link, a.id, a.naslov FROM srv_nice_links l, srv_anketa a WHERE a.id=l.ank_id ORDER BY l.link ASC");
 		
-		while ($row = mysqli_fetch_array($sql)) {		
-			echo '<p><strong style="display:inline-block; width:300px;">'.$row['link'].'</strong> <a href="index.php?anketa='.$row['id'].'&a=vabila&m=url">'.$row['naslov'].'</a></p>';
-		}
-		
+		$table_exists = 0;
+        while ($row = mysqli_fetch_array($sql)) {   
+            if ($table_exists == 0) {
+                echo '<p class="bottom16">'.$lang['srv_nice_url_note'].'</p>';
+                echo '<table>';
+                echo '<tr>';
+                echo '<th>'.$lang['srv_nice_url_extension'].'</th>';
+                echo '<th>'.$lang['srv_nice_url_surveyname'].'</th>';
+                echo '</tr>';
+
+                $table_exists = 1;
+            }
+
+            echo '<tr>';
+            echo '<td>'.$row['link'].'</td>';
+            echo '<td><a href="index.php?anketa='.$row['id'].'&a=vabila&m=url">'.$row['naslov'].'</a></td>';
+            echo '</tr>';
+        }
+
+        if ($table_exists == 1)
+            echo '</table>';
+
+		echo '</fieldset>'; 
 		echo '</div>';		
 	}
 	
diff --git a/lang/1.php b/lang/1.php
index 9514237aa..1252e2aca 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4495,6 +4495,9 @@ $lang = array (
 	"srv_nice_url_short"						=>  "je prekratek! Minimalna dolžina so 3 znaki.",
 	"srv_nice_url_long"							=>  "je predolg! Maksimalna dolžina je 20 znakov.",
 	"srv_nice_url_title"						=>  "Anketa ima naslednji URL naslov:",
+	"srv_nice_url_note"							=>	"V spodnji tabeli je seznam vseh lepih URL povezav na tej namestitvi in povezave do anket, za katere so bile ustvarjene.",
+	"srv_nice_url_surveyname"					=>  "Ime ankete",
+	"srv_nice_url_extension"					=>  "Končnica lepe URL povezave",
 	"activate_this_cat_in_edit_db"				=>	"Filter je potrebno aktivirati v urejanju baze, saj trenutno ni obkljukan.",
 	"srv_undecided"								=>	"Nedoločen",
 	"srv_todo"									=>	"Za narediti",
diff --git a/lang/2.php b/lang/2.php
index 896b76c73..b05df0ee4 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4474,7 +4474,10 @@ $lang = array (
 	"srv_nice_url_short"						=>  "is too short! Minimal length is 3 characters.",
 	"srv_nice_url_long"							=>  "is too long! Maximal length is 20 characters.",
 	"srv_nice_url_title"						=>  "Survey has the following URL address:",
-	"activate_this_cat_in_edit_db"					=>	"Filter needs to be activated using 'edit database' as it is currently not checked.",
+	"srv_nice_url_note"							=>	"The table below lists all the custom URLs on this installation, and the links to the surveys for which they were created."
+	"srv_nice_url_surveyname"					=>  "Survey name",
+	"srv_nice_url_extension"					=>  "Custom URl extension",
+	"activate_this_cat_in_edit_db"				=>	"Filter needs to be activated using 'edit database' as it is currently not checked.",
 	"srv_undecided"								=>	"Undecided",
 	"srv_todo"									=>	"To do",
 	"srv_done"									=>	"Done",