diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 5c89e5591c3..0557e89ce71 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -22,8 +22,8 @@
 	</head>
 	<body id="<?php p($_['bodyid']);?>">
 		<?php include('layout.noscript.warning.php'); ?>
-		<div class="wrapper"><!-- for sticky footer -->
-			<div class="v-align"><!-- vertically centred box -->
+		<div class="wrapper">
+			<div class="v-align">
 				<?php if ($_['bodyid'] === 'body-login' ): ?>
 					<header role="banner">
 						<div id="header">
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index e06ed00098f..138545f2ccc 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -118,9 +118,10 @@
 						</a>
 					</li>
 				<?php endforeach; ?>
-
-				<!-- show "More apps" link to app administration directly in app navigation, as last entry -->
-				<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
+				<?php 
+					/* show "More apps" link to app administration directly in app navigation, as last entry */
+					if(OC_User::isAdminUser(OC_User::getUser())): 
+				?>
 					<li id="apps-management">
 						<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps')); ?>" title=""
 							<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
diff --git a/core/templates/message.html b/core/templates/message.html
index cd642231a9e..a98fd31a7fe 100644
--- a/core/templates/message.html
+++ b/core/templates/message.html
@@ -1,3 +1,3 @@
-<div id="{dialog_name}" title="{title} "><!-- the ' ' after {title} fixes ie8, see http://stackoverflow.com/a/5313137/828717 -->
+<div id="{dialog_name}" title="{title} "><?php /* the ' ' after {title} fixes ie8, see http://stackoverflow.com/a/5313137/828717 */ ?>
 	<p><span class="ui-icon ui-icon-{type}"></span>{message}</p>
 </div>
