diff --git a/admin_index.php b/admin_index.php
index f0d9d193..748a78c8 100644
--- a/admin_index.php
+++ b/admin_index.php
@@ -107,7 +107,7 @@ if($page == 'overview')
 					$lookfornewversion_lable = $_version;
 					$lookfornewversion_link = $_link;
 					$lookfornewversion_addinfo = $_message;
-					
+
 					if (version_compare($version, $_version) == -1) {
 						$isnewerversion = 1;
 					} else {
@@ -283,7 +283,7 @@ elseif($page == 'change_language')
 		$language_options = '';
 
 		$default_lang = $settings['panel']['standardlanguage'];
-		if($userinfo['def_language'] != '') { 
+		if($userinfo['def_language'] != '') {
 			$default_lang = $userinfo['def_language'];
 		}
 
diff --git a/lib/classes/output/class.linker.php b/lib/classes/output/class.linker.php
index d687248a..b87a6332 100644
--- a/lib/classes/output/class.linker.php
+++ b/lib/classes/output/class.linker.php
@@ -114,7 +114,6 @@ class linker
 			$link .= '/';
 		}
 
-		$link .= $this->filename;
 
 		# Overwrite $this->args with parameters of this function (if necessary)
 		if(func_num_args() == 1 && is_array(func_get_arg(0)))
@@ -122,6 +121,17 @@ class linker
 			$this->args = array_merge($this->args, func_get_arg(0));
 		}
 
+		# temporary until frontcontroller exists
+		# We got a section in the URL -> add area and section as filename
+		if (isset($this->args['section']))
+		{
+			$link .= AREA . '_' . $this->args['section'] . '.php';
+		}
+		else
+		{
+			$link .= $this->filename;
+		}
+
 		# Let's see if we are done (no arguments in query)
 		if (count($this->args) == 0)
 		{
diff --git a/lib/init.php b/lib/init.php
index d225bcab..92be1ae3 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -306,6 +306,10 @@ if($language != 'English')
 	}
 }
 
+// Initialize our new link - class
+
+$linker = new linker('index.php', $s);
+
 /**
  * global Theme-variable
  */
@@ -320,7 +324,7 @@ if(isset($userinfo['theme']) && $userinfo['theme'] != $theme)
 }
 
 /*
- * check for custom header-graphic 
+ * check for custom header-graphic
  */
 $hl_path = 'images/'.$theme;
 $header_logo = $hl_path.'/logo.png';
@@ -371,7 +375,7 @@ if(AREA == 'admin' || AREA == 'customer')
 	if(hasUpdates($version))
 	{
 		/*
-		 * if froxlor-files have been updated 
+		 * if froxlor-files have been updated
 		 * but not yet configured by the admin
 		 * we only show logout and the update-page
 		 */
@@ -389,7 +393,7 @@ if(AREA == 'admin' || AREA == 'customer')
 							'label' => $lng['login']['logout'],
 						),
 					),
-				),		
+				),
 				'server' => array (
 					'label' => $lng['admin']['server'],
 					'required_resources' => 'change_serversettings',
@@ -429,7 +433,7 @@ elseif(isset($_GET['action']))
 else
 {
 	$action = '';
-	
+
 	// clear request data
 	if (isset($_SESSION)) {
 		unset($_SESSION['requestData']);
@@ -459,7 +463,7 @@ if($page == '')
  */
 $mail = new PHPMailer(true);
 if(PHPMailer::ValidateAddress($settings['panel']['adminmail']) !== false)
-{	
+{
 	// set return-to address and custom sender-name, see #76
 	$mail->SetFrom($settings['panel']['adminmail'], $settings['panel']['adminmail_defname']);
 	if ($settings['panel']['adminmail_return'] != '') {
diff --git a/templates/Classic/admin/index/change_language.tpl b/templates/Classic/admin/index/change_language.tpl
index 45c1becd..92b61b6c 100644
--- a/templates/Classic/admin/index/change_language.tpl
+++ b/templates/Classic/admin/index/change_language.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
diff --git a/templates/Classic/admin/index/change_password.tpl b/templates/Classic/admin/index/change_password.tpl
index 75a60005..9894b62b 100644
--- a/templates/Classic/admin/index/change_password.tpl
+++ b/templates/Classic/admin/index/change_password.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
diff --git a/templates/Classic/admin/index/change_theme.tpl b/templates/Classic/admin/index/change_theme.tpl
index 34c100cd..a2d84a21 100644
--- a/templates/Classic/admin/index/change_theme.tpl
+++ b/templates/Classic/admin/index/change_theme.tpl
@@ -1,5 +1,5 @@
 $header
-	<form method="post" action="$filename">
+	<form method="post" action="{$linker->getLink(array('section' => 'index'))}">
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
diff --git a/templates/Froxlor/admin/index/change_language.tpl b/templates/Froxlor/admin/index/change_language.tpl
index 4190d20a..393cde15 100644
--- a/templates/Froxlor/admin/index/change_language.tpl
+++ b/templates/Froxlor/admin/index/change_language.tpl
@@ -8,7 +8,7 @@ $header
 		</header>
 
 		<section class="tinyform bradiusodd">
-			<form method="post" action="$filename" enctype="application/x-www-form-urlencoded">
+			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changelanguage']}</legend>
 				<p>
diff --git a/templates/Froxlor/admin/index/change_password.tpl b/templates/Froxlor/admin/index/change_password.tpl
index 8c852bc6..cd8649c0 100644
--- a/templates/Froxlor/admin/index/change_password.tpl
+++ b/templates/Froxlor/admin/index/change_password.tpl
@@ -8,9 +8,9 @@ $header
 		</header>
 
 		<section class="tinyform bradiusodd">
-			<form method="post" action="$filename" enctype="application/x-www-form-urlencoded">
+			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp{$lng['menue']['main']['changepassword']}</legend>
+				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changepassword']}</legend>
 				<p>
 					<label for="old_password">{$lng['changepassword']['old_password']}:</label>&nbsp;
 					<input type="password" id="old_password" name="old_password" />
diff --git a/templates/Froxlor/admin/index/change_theme.tpl b/templates/Froxlor/admin/index/change_theme.tpl
index 82616fc5..d34c97d6 100644
--- a/templates/Froxlor/admin/index/change_theme.tpl
+++ b/templates/Froxlor/admin/index/change_theme.tpl
@@ -8,7 +8,7 @@ $header
 		</header>
 
 		<section class="tinyform bradiusodd">
-			<form method="post" action="$filename" enctype="application/x-www-form-urlencoded">
+			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changetheme']}</legend>
 				<p>