diff --git a/templates/Classic/admin/ipsandports/ipsandports.tpl b/templates/Classic/admin/ipsandports/ipsandports.tpl
index 01c5bbcb..6f3c63e0 100644
--- a/templates/Classic/admin/ipsandports/ipsandports.tpl
+++ b/templates/Classic/admin/ipsandports/ipsandports.tpl
@@ -1,5 +1,5 @@
 $header
-	<form action="$filename" method="post">
+	<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post">
                 <input type="hidden" name="s" value="$s"/>
                 <input type="hidden" name="page" value="$page"/>
 		<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
@@ -24,7 +24,7 @@ $header
 			</tr>
 			</if>
 			<tr>
-				<td class="field_display_border_left" colspan="9"><a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['ipsandports']['add']}</a></td>
+				<td class="field_display_border_left" colspan="9"><a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['ipsandports']['add']}</a></td>
 			</tr>
 		</table>
 	</form>
diff --git a/templates/Classic/admin/ipsandports/ipsandports_add.tpl b/templates/Classic/admin/ipsandports/ipsandports_add.tpl
index b9014b69..459b29c6 100644
--- a/templates/Classic/admin/ipsandports/ipsandports_add.tpl
+++ b/templates/Classic/admin/ipsandports/ipsandports_add.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'ipsandports'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/admin/ipsandports/ipsandports_edit.tpl b/templates/Classic/admin/ipsandports/ipsandports_edit.tpl
index 55888d96..b8c9ed65 100644
--- a/templates/Classic/admin/ipsandports/ipsandports_edit.tpl
+++ b/templates/Classic/admin/ipsandports/ipsandports_edit.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'ipsandports'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
diff --git a/templates/Classic/admin/ipsandports/ipsandports_ipandport.tpl b/templates/Classic/admin/ipsandports/ipsandports_ipandport.tpl
index 3c1c3502..5543f6e8 100644
--- a/templates/Classic/admin/ipsandports/ipsandports_ipandport.tpl
+++ b/templates/Classic/admin/ipsandports/ipsandports_ipandport.tpl
@@ -6,6 +6,6 @@
 	<td class="field_name"><font size="-1"><if $row['specialsettings']!=''>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></font></td>
 	<td class="field_name"><font size="-1"><if $row['vhostcontainer_servername_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></font></td>
 	<td class="field_name"><font size="-1"><if $row['ssl']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></font></td>
-	<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['id']}">{$lng['panel']['edit']}</a></td>
-	<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['id']}">{$lng['panel']['delete']}</a></td>
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">{$lng['panel']['edit']}</a></td>
+	<td class="field_name"><a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">{$lng['panel']['delete']}</a></td>
 </tr>
diff --git a/templates/Froxlor/admin/ipsandports/ipsandports.tpl b/templates/Froxlor/admin/ipsandports/ipsandports.tpl
index 7962960c..70ed67a0 100644
--- a/templates/Froxlor/admin/ipsandports/ipsandports.tpl
+++ b/templates/Froxlor/admin/ipsandports/ipsandports.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section>
 			
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post" enctype="application/x-www-form-urlencoded">
 
 			<div class="overviewsearch">
 				{$searchcode}
@@ -18,7 +18,7 @@ $header
 			<if 15 < $count>
 			<div class="overviewadd">
 				<img src="images/Froxlor/icons/ipsports_add.png" alt="" />&nbsp;
-				<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['ipsandports']['add']}</a>
+				<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['ipsandports']['add']}</a>
 			</div>
 			</if>
 
@@ -56,7 +56,7 @@ $header
 
 			<div class="overviewadd">
 				<img src="images/Froxlor/icons/ipsports_add.png" alt="" />&nbsp;
-				<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['ipsandports']['add']}</a>
+				<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['ipsandports']['add']}</a>
 			</div>
 
 		</section>
diff --git a/templates/Froxlor/admin/ipsandports/ipsandports_add.tpl b/templates/Froxlor/admin/ipsandports/ipsandports_add.tpl
index 873a2ca8..97dc5032 100644
--- a/templates/Froxlor/admin/ipsandports/ipsandports_add.tpl
+++ b/templates/Froxlor/admin/ipsandports/ipsandports_add.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section class="fullform bradiusodd">
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/admin/ipsandports/ipsandports_edit.tpl b/templates/Froxlor/admin/ipsandports/ipsandports_edit.tpl
index 891bd2cf..598b0212 100644
--- a/templates/Froxlor/admin/ipsandports/ipsandports_edit.tpl
+++ b/templates/Froxlor/admin/ipsandports/ipsandports_edit.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section class="fullform bradiusodd">
 
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+			<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
diff --git a/templates/Froxlor/admin/ipsandports/ipsandports_ipandport.tpl b/templates/Froxlor/admin/ipsandports/ipsandports_ipandport.tpl
index 1515738a..11bc8908 100644
--- a/templates/Froxlor/admin/ipsandports/ipsandports_ipandport.tpl
+++ b/templates/Froxlor/admin/ipsandports/ipsandports_ipandport.tpl
@@ -7,10 +7,10 @@
 	<td><if $row['vhostcontainer_servername_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>
 	<td><if $row['ssl']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>
 	<td>
-		<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['id']}" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
 		</a>&nbsp;
-		<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['id']}" style="text-decoration:none;">
+		<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
 		</a>
 	</td>