diff --git a/adm/style/portal/acp_portal_calendar.html b/adm/style/portal/acp_portal_calendar.html
index 3ce3519a..f703502a 100644
--- a/adm/style/portal/acp_portal_calendar.html
+++ b/adm/style/portal/acp_portal_calendar.html
@@ -80,7 +80,7 @@
 	</form>
 
 <!-- ELSE -->
-	<form id="acp_portal_calendar" method="post" action="{U_ACTION}">
+	<form id="acp_portal_calendar" method="post" action="{B3P_U_ACTION}">
 	<!-- IF SHOW_MODULE_OPTIONS -->
 	<fieldset>
 		<legend>{L_MODULE_OPTIONS}</legend>
@@ -156,7 +156,7 @@
 			<input class="button2" name="add" type="submit" value="{L_ADD_EVENT}" />
 		</p>
 
-		<table cellspacing="1">
+		<table style="cellspacing: 1;">
 		<thead>
 		<tr>
 			<th>{L_EVENT_TITLE}</th>
diff --git a/adm/style/portal/acp_portal_menu.html b/adm/style/portal/acp_portal_menu.html
index ab23eda6..3c4a3957 100644
--- a/adm/style/portal/acp_portal_menu.html
+++ b/adm/style/portal/acp_portal_menu.html
@@ -71,7 +71,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>
@@ -146,7 +146,7 @@
 		<input class="button2" name="add" type="submit" value="{L_ACP_PORTAL_MENU_ADD}" />
 	</p>
 
-	<table cellspacing="1">
+	<table style="cellspacing: 1;">
 	<thead>
 	<tr>
 		<th>{L_ACP_PORTAL_MENU_TITLE}</th>
diff --git a/modules/calendar.php b/modules/calendar.php
index e4082674..0db55937 100644
--- a/modules/calendar.php
+++ b/modules/calendar.php
@@ -426,7 +426,7 @@ class calendar extends module_base
 		$events = (strlen($portal_config['board3_calendar_events_' . $module_id]) >= 1) ? $this->utf_unserialize($portal_config['board3_calendar_events_' . $module_id]) : array();
 
 		// append_sid() adds adm/ already, no need to add it here
-		$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/modules/custom.php b/modules/custom.php
index b38bface..5e2f58a3 100644
--- a/modules/custom.php
+++ b/modules/custom.php
@@ -187,7 +187,7 @@ class custom extends module_base
 
 		$portal_config = obtain_portal_config();
 
-		$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/modules/main_menu.php b/modules/main_menu.php
index a06cec95..5d265714 100644
--- a/modules/main_menu.php
+++ b/modules/main_menu.php
@@ -304,7 +304,7 @@ class main_menu extends module_base
 
 		$links = $this->utf_unserialize($portal_config['board3_menu_array_' . $module_id]);
 
-		$u_action = append_sid('index.' . $this->php_ext, 'i=%5Cboard3%5Cportal%5Cacp%5Cportal_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/modules/welcome.php b/modules/welcome.php
index 8b77a606..7ae9c2df 100644
--- a/modules/welcome.php
+++ b/modules/welcome.php
@@ -171,7 +171,7 @@ class welcome extends module_base
 
 		$portal_config = obtain_portal_config();
 
-		$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/tests/unit/portal/modules_manager_test.php b/tests/unit/portal/modules_manager_test.php
index c55c7a85..7e898a39 100644
--- a/tests/unit/portal/modules_manager_test.php
+++ b/tests/unit/portal/modules_manager_test.php
@@ -128,7 +128,7 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
 	public function test_get_module_link()
 	{
 		$this->modules_manager->set_acp_class('foo\bar')->set_u_action('index.php?i=25&amp;mode=barfoo');
-		$this->assertEquals('index.php?i=%5Cfoo%5Cbar&amp;mode=test&amp;module_id=5', $this->modules_manager->get_module_link('test', 5));
+		$this->assertEquals('index.php?i=-foo-bar&amp;mode=test&amp;module_id=5', $this->modules_manager->get_module_link('test', 5));
 	}
 
 	public function test_handle_ajax_request()