diff --git a/app/modules/Front/BaseFrontPresenter.php b/app/modules/Front/BaseFrontPresenter.php
index 9f477cf..50b567d 100644
--- a/app/modules/Front/BaseFrontPresenter.php
+++ b/app/modules/Front/BaseFrontPresenter.php
@@ -49,7 +49,7 @@ abstract class BaseFrontPresenter extends UnsecuredPresenter
 		foreach ($trs as $t) {
 			$lang1 = $t->getLangName1();
 			$lang2 = $t->getLangName2();
-
+			
 			$lang = mb_substr($lang1, 0, -1);
 			$lang .= "o-" . $lang2;
 			$slug = Strings::webalize($lang);
@@ -59,6 +59,7 @@ abstract class BaseFrontPresenter extends UnsecuredPresenter
 			$translations[$t->id]["t"] = $t;
 			$slugs[$slug] = $t;
 		}
+		$this->slug= $translations[1]["slug"];
 		$this->translations = $translations;
 		$this->dictionaries = $drs;
 		$this->drsSelect = $select;
diff --git a/app/modules/Front/Home/@layout.latte b/app/modules/Front/Home/@layout.latte
new file mode 100644
index 0000000..0ebab4d
--- /dev/null
+++ b/app/modules/Front/Home/@layout.latte
@@ -0,0 +1,4 @@
+{layout '../templates/@layout.latte'}
+{block #content}
+{block form}
+{/block}
\ No newline at end of file
diff --git a/app/modules/Front/Home/HomePresenter.php b/app/modules/Front/Home/HomePresenter.php
index c871921..69f5116 100644
--- a/app/modules/Front/Home/HomePresenter.php
+++ b/app/modules/Front/Home/HomePresenter.php
@@ -99,7 +99,8 @@ final class HomePresenter extends BaseFrontPresenter
 
 	public function actionIpa()
 	{
-		$this->redirect('Search:ipa',$this->translation,$this->term);
+		if ($this->term)
+			$this->redirect('Search:ipa',$this->translation,$this->term);
 	}
 
 	public function actionInteractive()
diff --git a/app/modules/Front/Home/templates/interactive.latte b/app/modules/Front/Home/templates/interactive.latte
index 496ab97..2c7002c 100644
--- a/app/modules/Front/Home/templates/interactive.latte
+++ b/app/modules/Front/Home/templates/interactive.latte
@@ -1,104 +1 @@
-{block title}Slovnik{/block}
-{block head}
-<script>
-$( document ).ready(function() {
- $("img.ajax").on("click", function (event) {
-    event.preventDefault();
-    id = $(this).attr("data-sound-id");
-    var audioElement = document.createElement('audio');
-    audioElement.setAttribute('src', {link Home:play} + "/" + id);
-    console.log("Play sound:" + id);
-    audioElement.play();
-});
-
-$(function() {
-	var select_name = "string";
-	$("input[name=" + select_name + "]").autocomplete({
-		source: function( request, response ) {
-			$.ajax({
-				url: {!$presenter->link('autocomplete')},
-				data: {
-					whichData: select_name,
-					typedText: request.term,
-					translation: $("select[name=translation]").val()
-				},
-				success: function( data ) {
-					response( $.map( data, function( item ) {
-						return { label: item, value: item }
-					}));
-				}
-			});
-		},
-		minLength: 3,
-		open: function() {
-			$(this).removeClass("ui-corner-all").addClass("ui-corner-top");
-		},
-		close: function() {
-			$(this).removeClass("ui-corner-top").addClass("ui-corner-all");
-		},
-		select: function(e, ui) {
-			$("#frm-searchForm-string").val(ui.item.value);
-			$("#frm-searchForm").submit();
-		}
-	});
-});
-
-
-
-
-});
-</script>
-{/block}
-
-{block content}
-
-	<div class="boxes">
-	{form searchForm}
-	<table>
-		<tr>
-			<th>{label string /}</th><th>{label translation /}</th>
-		</tr>
-		<tr>
-			<td>{input string}</td><td>{input translation}</td><td>{input search}</td>
-		</tr>
-	</table>
-	{ifset $result}
-		<table id="searchBox">
-
-		</table>
-		<table class="trans">
-		<tr>
-			<th>Preklad</th>
-		</tr>
-{var $last = ''}
-{foreach $result as $term}
-{if ($last != $term->string1 && $last != '') }
-				</div>
-			</td>
-		</tr>
-{/if}
-{if $last != $term->string1}
-		<tr>
-			<td>
-				<span class="term">{$term->string1}</span>&nbsp;
-				{foreach $term->pronunciations as $pron}
-					<span class="ipa-{$pron->type->id}">[{$pron->ipa}]</span>
-					<img n:if="$pron->filename" class="sound-ipa ajax" src="/images/sound.png" alt="Prehraj" style="vertical-align: middle;" data-sound-id="{$pron->id}" ></image>
-				{/foreach}
-				<br/>
-				<div style="margin-left: 20px;" class="translations">
-{/if}
-{$last == $term->string1 && trim($last2) != '' && trim($term->string2) != ''  ? ', ' : ''}{$term->string2}{**
-	Nutne kvoli newline
-**}
-{var $last = $term->string1}
-{var $last2 = $term->string2}
-{/foreach}
-		</table>
-	{/ifset}
-	{/form}
-	{control paginator}
-	</div>
-{/block}
-
-
+{block #content}
\ No newline at end of file
diff --git a/app/modules/Front/Home/templates/ipa.latte b/app/modules/Front/Home/templates/ipa.latte
new file mode 100644
index 0000000..2c7002c
--- /dev/null
+++ b/app/modules/Front/Home/templates/ipa.latte
@@ -0,0 +1 @@
+{block #content}
\ No newline at end of file
diff --git a/app/modules/Front/Search/templates/interactive.latte b/app/modules/Front/Search/templates/interactive.latte
new file mode 100644
index 0000000..496ab97
--- /dev/null
+++ b/app/modules/Front/Search/templates/interactive.latte
@@ -0,0 +1,104 @@
+{block title}Slovnik{/block}
+{block head}
+<script>
+$( document ).ready(function() {
+ $("img.ajax").on("click", function (event) {
+    event.preventDefault();
+    id = $(this).attr("data-sound-id");
+    var audioElement = document.createElement('audio');
+    audioElement.setAttribute('src', {link Home:play} + "/" + id);
+    console.log("Play sound:" + id);
+    audioElement.play();
+});
+
+$(function() {
+	var select_name = "string";
+	$("input[name=" + select_name + "]").autocomplete({
+		source: function( request, response ) {
+			$.ajax({
+				url: {!$presenter->link('autocomplete')},
+				data: {
+					whichData: select_name,
+					typedText: request.term,
+					translation: $("select[name=translation]").val()
+				},
+				success: function( data ) {
+					response( $.map( data, function( item ) {
+						return { label: item, value: item }
+					}));
+				}
+			});
+		},
+		minLength: 3,
+		open: function() {
+			$(this).removeClass("ui-corner-all").addClass("ui-corner-top");
+		},
+		close: function() {
+			$(this).removeClass("ui-corner-top").addClass("ui-corner-all");
+		},
+		select: function(e, ui) {
+			$("#frm-searchForm-string").val(ui.item.value);
+			$("#frm-searchForm").submit();
+		}
+	});
+});
+
+
+
+
+});
+</script>
+{/block}
+
+{block content}
+
+	<div class="boxes">
+	{form searchForm}
+	<table>
+		<tr>
+			<th>{label string /}</th><th>{label translation /}</th>
+		</tr>
+		<tr>
+			<td>{input string}</td><td>{input translation}</td><td>{input search}</td>
+		</tr>
+	</table>
+	{ifset $result}
+		<table id="searchBox">
+
+		</table>
+		<table class="trans">
+		<tr>
+			<th>Preklad</th>
+		</tr>
+{var $last = ''}
+{foreach $result as $term}
+{if ($last != $term->string1 && $last != '') }
+				</div>
+			</td>
+		</tr>
+{/if}
+{if $last != $term->string1}
+		<tr>
+			<td>
+				<span class="term">{$term->string1}</span>&nbsp;
+				{foreach $term->pronunciations as $pron}
+					<span class="ipa-{$pron->type->id}">[{$pron->ipa}]</span>
+					<img n:if="$pron->filename" class="sound-ipa ajax" src="/images/sound.png" alt="Prehraj" style="vertical-align: middle;" data-sound-id="{$pron->id}" ></image>
+				{/foreach}
+				<br/>
+				<div style="margin-left: 20px;" class="translations">
+{/if}
+{$last == $term->string1 && trim($last2) != '' && trim($term->string2) != ''  ? ', ' : ''}{$term->string2}{**
+	Nutne kvoli newline
+**}
+{var $last = $term->string1}
+{var $last2 = $term->string2}
+{/foreach}
+		</table>
+	{/ifset}
+	{/form}
+	{control paginator}
+	</div>
+{/block}
+
+
diff --git a/app/modules/Front/Search/templates/ipa.latte b/app/modules/Front/Search/templates/ipa.latte
index a49bff0..055be3c 100644
--- a/app/modules/Front/Search/templates/ipa.latte
+++ b/app/modules/Front/Search/templates/ipa.latte
@@ -17,10 +17,7 @@ $( document ).ready(function() {
 
 
 {block content}
-{block form}
-
-{/block}
-	{ifset $result}
+{ifset $result}
 		<table class="trans">	
 		<tr>
 			<th>Preklad</th>