diff --git a/adm/style/portal/acp_portal_calendar.html b/adm/style/portal/acp_portal_calendar.html
index ab3e990e..3ce3519a 100644
--- a/adm/style/portal/acp_portal_calendar.html
+++ b/adm/style/portal/acp_portal_calendar.html
@@ -149,47 +149,47 @@
 	</fieldset>
 
 	<fieldset>
-	<legend>{L_ACP_PORTAL_EVENTS}</legend>
-	<fieldset class="tabulated">
+		<legend>{L_ACP_PORTAL_EVENTS}</legend>
+		<fieldset class="tabulated">
 
-	<p class="quick">
-		<input class="button2" name="add" type="submit" value="{L_ADD_EVENT}" />
-	</p>
+		<p class="quick">
+			<input class="button2" name="add" type="submit" value="{L_ADD_EVENT}" />
+		</p>
 
-	<table cellspacing="1">
-	<thead>
-	<tr>
-		<th>{L_EVENT_TITLE}</th>
-		<th>{L_EVENT_DESC}</th>
-		<th>{L_EVENT_TIME}</th>
-		<th>{L_EVENT_LINK}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN events -->
-		<!-- IF events.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td style="text-align: center;">{events.EVENT_TITLE}</td>
-		<td style="text-align: center;">{events.EVENT_DESC}</td>
-		<td style="text-align: center;"><!-- IF events.EVENT_END -->{L_EVENT_START}{L_COLON}&nbsp;{events.EVENT_START}&nbsp;&#124;&nbsp;{L_EVENT_END}{L_COLON}&nbsp;{events.EVENT_END}<!-- ELSE -->{L_EVENT_TIME}{L_COLON}&nbsp;{events.EVENT_START}<!-- IF events.EVENT_ALL_DAY -->&nbsp;&#124;&nbsp;{L_EVENT_ALL_DAY}<!-- ENDIF --><!-- ENDIF --></td>
-		<td style="text-align: center;"><a href="{events.EVENT_URL}" alt="{events.EVENT_TITLE}">{events.EVENT_URL_RAW}</td>
-		<td style="text-align: center;">
-			<a href="{events.U_EDIT}">{ICON_EDIT}</a> <a href="{events.U_DELETE}">{ICON_DELETE}</a>
-		</td>
-	</tr>
-	<!-- BEGINELSE -->
-	<tr class="row1">
-		<td style="text-align: center;" colspan="5">{L_NO_EVENTS}</td>
-	</tr>
-	<!-- END events -->
-	</tbody>
-	</table>
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-	</fieldset>
+		<table cellspacing="1">
+		<thead>
+		<tr>
+			<th>{L_EVENT_TITLE}</th>
+			<th>{L_EVENT_DESC}</th>
+			<th>{L_EVENT_TIME}</th>
+			<th>{L_EVENT_LINK}</th>
+			<th>{L_ACTION}</th>
+		</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN events -->
+			<!-- IF events.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<td style="text-align: center;">{events.EVENT_TITLE}</td>
+			<td style="text-align: center;">{events.EVENT_DESC}</td>
+			<td style="text-align: center;"><!-- IF events.EVENT_END -->{L_EVENT_START}{L_COLON}&nbsp;{events.EVENT_START}&nbsp;&#124;&nbsp;{L_EVENT_END}{L_COLON}&nbsp;{events.EVENT_END}<!-- ELSE -->{L_EVENT_TIME}{L_COLON}&nbsp;{events.EVENT_START}<!-- IF events.EVENT_ALL_DAY -->&nbsp;&#124;&nbsp;{L_EVENT_ALL_DAY}<!-- ENDIF --><!-- ENDIF --></td>
+			<td style="text-align: center;"><a href="{events.EVENT_URL}" alt="{events.EVENT_TITLE}">{events.EVENT_URL_RAW}</td>
+			<td style="text-align: center;">
+				<a href="{events.U_EDIT}">{ICON_EDIT}</a> <a href="{events.U_DELETE}">{ICON_DELETE}</a>
+			</td>
+		</tr>
+		<!-- BEGINELSE -->
+		<tr class="row1">
+			<td style="text-align: center;" colspan="5">{L_NO_EVENTS}</td>
+		</tr>
+		<!-- END events -->
+		</tbody>
+		</table>
+		<p class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		</p>
+		{S_FORM_TOKEN}
+		</fieldset>
 	</fieldset>
 	</form>
 
diff --git a/adm/style/portal/acp_portal_links.html b/adm/style/portal/acp_portal_links.html
index 80d57713..8fb0934c 100644
--- a/adm/style/portal/acp_portal_links.html
+++ b/adm/style/portal/acp_portal_links.html
@@ -64,7 +64,7 @@
 	</form>
 
 <!-- ELSE -->
-	<form id="acp_portal_links" method="post" action="{U_ACTION}">
+	<form id="acp_portal_links" method="post" action="{B3P_U_ACTION}">
 	<!-- IF SHOW_MODULE_OPTIONS -->
 	<fieldset>
 		<legend>{L_MODULE_OPTIONS}</legend>
@@ -139,7 +139,7 @@
 		<input class="button2" name="add" type="submit" value="{L_ACP_PORTAL_LINK_ADD}" />
 	</p>
 
-	<table cellspacing="1">
+	<table style="cellspacing: 1;">
 	<thead>
 	<tr>
 		<th>{L_ACP_PORTAL_LINK_TITLE}</th>
diff --git a/modules/links.php b/modules/links.php
index 2db14e1c..6b583e60 100644
--- a/modules/links.php
+++ b/modules/links.php
@@ -249,7 +249,7 @@ class links extends module_base
 
 		$links = $this->utf_unserialize($portal_config['board3_links_array_' . $module_id]);
 
-		$u_action = append_sid('index.' . $this->php_ext, 'i=\board3\portal\acp\portal_module&amp;mode=config&amp;module_id=' . $module_id);
+		$u_action = append_sid('index.' . $this->php_ext, 'i=-board3-portal-acp-portal_module&amp;mode=config&amp;module_id=' . $module_id);
 
 		switch ($action)
 		{
diff --git a/portal/modules/manager.php b/portal/modules/manager.php
index 651b8219..5c2cce53 100644
--- a/portal/modules/manager.php
+++ b/portal/modules/manager.php
@@ -393,6 +393,6 @@ class manager
 	 */
 	public function get_module_link($mode, $module_id)
 	{
-		return preg_replace(array('/i=[0-9]+/', '/mode=[a-zA-Z0-9_]+/'), array('i=%5C' . str_replace('\\', '%5C', $this->acp_class), 'mode=' . $mode), $this->u_action) . (($module_id) ? '&amp;module_id=' . $module_id : '');
+		return preg_replace(array('/i=[0-9]+/', '/mode=[a-zA-Z0-9_]+/'), array('i=%5C' . str_replace('\\', '-', $this->acp_class), 'mode=' . $mode), $this->u_action) . (($module_id) ? '&amp;module_id=' . $module_id : '');
 	}
 }