diff --git a/viewer/static/css/styles.css b/viewer/static/css/styles.css
index afbc60c..12ba335 100644
--- a/viewer/static/css/styles.css
+++ b/viewer/static/css/styles.css
@@ -11,6 +11,14 @@ body {
     margin: 0px;
 }
 
+#id_username {
+    width: 100%;
+}
+
+#id_password {
+    width: 100%;
+}
+
 /****************************************************************************
  * Containers.                                                              *
  ****************************************************************************/
@@ -26,10 +34,8 @@ body {
 }
 
 .image-container {
-    position: relative;
-    height: 100%;
-    width: 100%;
-    overflow: hidden;
+    max-width: 900px;
+    max-height: 600px;
 }
 
 .fc {
@@ -44,29 +50,28 @@ body {
     width: 100%;
 }
 
-.pd {
-    padding: 10%;
+.fixed-width {
+    width: 300px;
 }
 
 /****************************************************************************
  * Content.                                                                 *
  ****************************************************************************/
 
-.image-container img {
-    position: absolute;
-    top:      0;
-    left:     0;
-    bottom:   0;
-    right:    0;
-    height: 100%;
+.image {
+    max-width: 100%;
+    max-height: 600px;
     width: auto;
-    margin: auto;
 }
 
 .mauto {
     margin: auto;
 }
 
+.mauto-top {
+    margin: 200px auto;
+}
+
 .navigation-icon {
     width: 100px;
 }
diff --git a/viewer/templates/image_view.html b/viewer/templates/image_view.html
index e280947..76c54d4 100644
--- a/viewer/templates/image_view.html
+++ b/viewer/templates/image_view.html
@@ -42,7 +42,7 @@
                 </td>
 
                 <!-- Current image. -->
-                <td class="full-width">
+                <td>
                     <a href="{{image_path}}" target="_blank">
                         <div class="image-container">
                             <img src="{{image_path}}" class="image">
diff --git a/viewer/templates/registration/login.html b/viewer/templates/registration/login.html
index 0232546..2ed461b 100644
--- a/viewer/templates/registration/login.html
+++ b/viewer/templates/registration/login.html
@@ -8,12 +8,11 @@
         </title>
         <link href="{% static 'css/styles.css' %}" rel="stylesheet">
     </head>
-
     <body class="background">
-        <div class="fc mauto pd">
-            <form method="post" action="{% url 'login' %}" class="fc">
+        <div class="fixed-width mauto-top">
+            <form method="post" action="{% url 'login' %}" class="full-width">
                 {% csrf_token %}
-                <table>
+                <table class="full-width">
                     <tr>
                         <td>
                             {{ form.username.label_tag }}
@@ -22,7 +21,6 @@
                             {{ form.username }}
                         </td>
                     </tr>
-
                     <tr>
                         <td>
                             {{ form.password.label_tag }}
@@ -31,10 +29,13 @@
                             {{ form.password }}
                         </td>
                     </tr>
+                    <tr>
+                        <td colspan="2">
+                            <input type="submit" value="login" class="float-right">
+                            <input type="hidden" name="next" value="{{ next }}">
+                        </td>
+                    </tr>
                 </table>
-
-                <input type="submit" value="login" class="float-right">
-                <input type="hidden" name="next" value="{{ next }}">
             </form>
         </div>
     </body>

{{ form.username.label_tag }} @@ -22,7 +21,6 @@ {{ form.username }}
{{ form.password.label_tag }} @@ -31,10 +29,13 @@ {{ form.password }}
+ + +