diff --git a/public_html/media/js/core.js b/public_html/media/js/core.js
index a7e4734d..3d543db7 100644
--- a/public_html/media/js/core.js
+++ b/public_html/media/js/core.js
@@ -101,13 +101,14 @@ $(function()
 			form.append(input);
 		});
 	});
-
-	$(window).resize();
 });
 
+
+//modify DOM on small viewports
 $(window).resize(function()
 {
-	//modify DOM on small viewports
+	if ($('body').width() == $('body').data('last-width'))
+		return;
 	$('#inner-content .unit').addClass('bottom-unit');
 	if ($('body').width() < 600)
 	{
@@ -118,7 +119,9 @@ $(window).resize(function()
 	else
 	{
 		$('body').removeClass('small-screen');
-		$('#inner-content').insertAfter($('#sidebar'));
+		$('#sidebar').insertBefore($('#inner-content'));
 		$('#sidebar .unit').removeClass('bottom-unit').addClass('left-unit');
 	}
+	$('body').data('last-width', $('body').width());
 });
+$(function() { $(window).resize(); });
diff --git a/src/Views/auth-login.phtml b/src/Views/auth-login.phtml
index b54aede1..4729479b 100644
--- a/src/Views/auth-login.phtml
+++ b/src/Views/auth-login.phtml
@@ -1,12 +1,11 @@
 <form action="<?php echo \Chibi\UrlHelper::route('auth', 'login') ?>" class="auth aligned" method="post">
-
 	<div>
 		<p>If you don't have an account yet,<br/><a href="<?php echo \Chibi\UrlHelper::route('user', 'registration'); ?>">click here</a> to create a new one.</p>
 	</div>
 
 	<div>
 		<label class="left" for="name">User name:</label>
-		<div class="input-wrapper"><input id="name" name="name"/></div>
+		<div class="input-wrapper"><input type="text" id="name" name="name"/></div>
 	</div>
 
 	<div>
diff --git a/src/Views/user-registration.phtml b/src/Views/user-registration.phtml
index afd1d99e..37a4a852 100644
--- a/src/Views/user-registration.phtml
+++ b/src/Views/user-registration.phtml
@@ -16,7 +16,7 @@
 
 		<div>
 			<label class="left" for="name">User name:</label>
-			<div class="input-wrapper"><input id="name" name="name" value="<?php echo $this->context->suppliedName ?>" placeholder="e.g. darth_vader" autocomplete="off"/></div>
+			<div class="input-wrapper"><input type="text" id="name" name="name" value="<?php echo $this->context->suppliedName ?>" placeholder="e.g. darth_vader" autocomplete="off"/></div>
 		</div>
 
 		<div>
@@ -31,7 +31,7 @@
 
 		<div>
 			<label class="left" for="email">E-mail address:</label>
-			<div class="input-wrapper"><input id="email" name="email" value="<?php echo $this->context->suppliedEmail ?>" placeholder="e.g. vader@empire.gov" autocomplete="off"/></div>
+			<div class="input-wrapper"><input type="text" id="email" name="email" value="<?php echo $this->context->suppliedEmail ?>" placeholder="e.g. vader@empire.gov" autocomplete="off"/></div>
 		</div>
 
 		<div>