diff --git a/root/install_portal/style/layout_header.php b/root/install_portal/style/layout_header.php
index 1e918a7d..c195daf5 100644
--- a/root/install_portal/style/layout_header.php
+++ b/root/install_portal/style/layout_header.php
@@ -22,7 +22,6 @@ if( !defined('IN_PHPBB') || !defined('IN_PORTAL_INSTALL') )
 	<div id="page-header">
 		<h1><?php echo $page_title; ?></h1>
 		<p><a href="<?php echo $phpbb_root_path . '">' . $user->lang['INDEX']; ?></a></p>
-		<p id="skip"><a href="#acp">Skip to content</a></p>
 	</div>
 	<div id="page-body">
 		<div id="acp">
@@ -41,7 +40,7 @@ if( !defined('IN_PHPBB') || !defined('IN_PORTAL_INSTALL') )
 if( $old_version != 0 && $phpbb3portal === false )
 {
 ?>
-							<li<?php echo ( ($mode == 'uninstall') ? ' id="activemenu"' : '' ); ?>><a href="install.<?php echo $phpEx; ?>?mode=uninstall"><span><?php echo $user->lang['INSTALLER_UNINSTALL']; ?></span></a></li>
+							<li<?php echo ( ($mode == 'uninstall') ? ' id="activemenu"' : '' ); ?>><a href="<?php echo append_sid('install.'.$phpEx, 'mode=uninstall'); ?>"><span><?php echo $user->lang['INSTALLER_UNINSTALL']; ?></span></a></li>
 <?php
 }
 ?>
diff --git a/root/install_portal/style/layout_install.php b/root/install_portal/style/layout_install.php
index 37572a4f..9230c19e 100644
--- a/root/install_portal/style/layout_install.php
+++ b/root/install_portal/style/layout_install.php
@@ -23,7 +23,7 @@ else
 
 <h1><?php echo $user->lang['INSTALLER_INSTALL_TITLE']; ?></h1>
 <p><?php echo $user->lang['INSTALLER_INSTALL_NOTE']; ?></p>
-<form id="acp_board" method="post" action="install.php?mode=install">
+<form id="acp_board" method="post" action="<?php echo append_sid('install.'.$phpEx, 'mode=install'); ?>">
 	<fieldset>
 		<legend><?php echo $user->lang['INSTALLER_INSTALL']; ?></legend>
 		<dl>
@@ -31,8 +31,8 @@ else
 			<dd><label><input name="confirm" value="1" class="radio" type="radio" /><?php echo $user->lang['YES']; ?></label><label><input name="confirm" value="0" checked="checked" class="radio" type="radio" /><?php echo $user->lang['NO']; ?></label></dd>
 		</dl>
 		<p class="submit-buttons">
-			<input class="button1" id="submit" name="submit" value="Submit" type="submit" />&nbsp;
-			<input class="button2" id="reset" name="reset" value="Reset" type="reset" />
+			<input class="button1" id="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" type="submit" />&nbsp;
+			<input class="button2" id="reset" name="reset" value="<?php echo $user->lang['RESET']; ?>" type="reset" />
 		</p>
 	</fieldset>
 </form>
diff --git a/root/install_portal/style/layout_menu.php b/root/install_portal/style/layout_menu.php
index cf4ea880..5040b9c8 100644
--- a/root/install_portal/style/layout_menu.php
+++ b/root/install_portal/style/layout_menu.php
@@ -32,6 +32,6 @@ case 'none':
 <?php
 break;
 }
-include $phpbb_root_path.'style/layout_footer.' . $phpEx;
+include $phpbb_root_path.'install_portal/style/layout_footer.' . $phpEx;
 
 ?>
\ No newline at end of file
diff --git a/root/install_portal/style/layout_uninstall.php b/root/install_portal/style/layout_uninstall.php
index aee36470..21b4018b 100644
--- a/root/install_portal/style/layout_uninstall.php
+++ b/root/install_portal/style/layout_uninstall.php
@@ -23,7 +23,7 @@ else
 
 <h1><?php echo $user->lang['INSTALLER_UNINSTALL_TITLE']; ?></h1>
 <p><?php echo $user->lang['INSTALLER_UNINSTALL_NOTE']; ?></p>
-<form id="acp_board" method="post" action="install.php?mode=uninstall">
+<form id="acp_board" method="post" action="<?php echo append_sid('install.'.$phpEx, 'mode=uninstall'); ?>">
 	<fieldset>
 		<legend><?php echo $user->lang['INSTALLER_UNINSTALL']; ?></legend>
 		<dl>
@@ -31,8 +31,8 @@ else
 			<dd><label><input name="confirm" value="1" class="radio" type="radio" /><?php echo $user->lang['YES']; ?></label><label><input name="confirm" value="0" checked="checked" class="radio" type="radio" /><?php echo $user->lang['NO']; ?></label></dd>
 		</dl>
 		<p class="submit-buttons">
-			<input class="button1" id="submit" name="submit" value="Submit" type="submit" />&nbsp;
-			<input class="button2" id="reset" name="reset" value="Reset" type="reset" />
+			<input class="button1" id="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" type="submit" />&nbsp;
+			<input class="button2" id="reset" name="reset" value="<?php echo $user->lang['RESET']; ?>" type="reset" />
 		</p>
 	</fieldset>
 </form>
diff --git a/root/install_portal/style/layout_update.php b/root/install_portal/style/layout_update.php
index d11c8705..bc73f0b2 100644
--- a/root/install_portal/style/layout_update.php
+++ b/root/install_portal/style/layout_update.php
@@ -26,7 +26,7 @@ else
 
 <h1><?php echo $user->lang['INSTALLER_UPDATE_TITLE']; ?></h1>
 <p><?php echo sprintf($user->lang['INSTALLER_UPDATE_NOTE'], $old_version, $current_version); ?></p>
-<form id="acp_board" method="post" action="install.php?mode=update">
+<form id="acp_board" method="post" action="<?php echo append_sid('install.'.$phpEx, 'mode=update'); ?>">
 	<fieldset>
 		<legend><?php echo $user->lang['INSTALLER_UPDATE']; ?></legend>
 		<dl>
@@ -34,8 +34,8 @@ else
 			<dd><label><input name="confirm" value="1" class="radio" type="radio" /><?php echo $user->lang['YES']; ?></label><label><input name="confirm" value="0" checked="checked" class="radio" type="radio" /><?php echo $user->lang['NO']; ?></label></dd>
 		</dl>
 		<p class="submit-buttons">
-			<input class="button1" id="submit" name="submit" value="Submit" type="submit" />&nbsp;
-			<input class="button2" id="reset" name="reset" value="Reset" type="reset" />
+			<input class="button1" id="submit" name="submit" value="<?php echo $user->lang['SUBMIT']; ?>" type="submit" />&nbsp;
+			<input class="button2" id="reset" name="reset" value="<?php echo $user->lang['RESET']; ?>" type="reset" />
 		</p>
 	</fieldset>
 </form>