diff --git a/console/templates/console-base.html b/console/templates/console-base.html
index 5507dd60..e5d33d0e 100644
--- a/console/templates/console-base.html
+++ b/console/templates/console-base.html
@@ -1,6 +1,7 @@
 {% load static %}
 {% load i18n %}
-{% get_current_language as LANGUAGE_CODE %}<html lang="{{ LANGUAGE_CODE }}">
+{% get_current_language as LANGUAGE_CODE %}<!DOCTYPE html>
+<html lang="{{ LANGUAGE_CODE }}">
 
 <head>
     <meta charset="utf-8">
@@ -11,11 +12,17 @@
     <link href="{% static "css/webvirtcloud.css" %}" rel="stylesheet">
 
     <style>
+        body {
+            padding-bottom: 0;
+        }
+
         #main_container {
             padding: 0;
             width: 100%;
             max-width: none;
-            height: 100%;
+            height: 100vh;
+            display: flex;
+            flex-direction: column;
             background-color: #494949;
             border-bottom-right-radius: 850px 600px;
 
diff --git a/console/templates/console-xterm.html b/console/templates/console-xterm.html
index 090a5d21..b6e766f4 100644
--- a/console/templates/console-xterm.html
+++ b/console/templates/console-xterm.html
@@ -9,6 +9,9 @@
 <script src="{% static 'js/xterm/addon-fit.js' %}"></script>
 
 <script src="{% static 'js/socket.io.js' %}"></script>
+<style>
+    #terminal { flex: 1; min-height: 0; }
+</style>
 
 {% endblock %}
 {% block content %}
@@ -17,7 +20,7 @@
     <button id="button" type="button" onclick="myFunction();">Connect</button>
 </div>
 
-<div style="width: 100%; height:100%;" id="terminal"></div>
+<div id="terminal"></div>
 <script>
         // socketiod is behind this page's own /socket.io/ location; the page's
         // signed token is the credential (the cookie holds the last console's)