diff --git a/allianceauth/authentication/templates/authentication/dashboard.html b/allianceauth/authentication/templates/authentication/dashboard.html
index 8140a78f..ebea7e05 100644
--- a/allianceauth/authentication/templates/authentication/dashboard.html
+++ b/allianceauth/authentication/templates/authentication/dashboard.html
@@ -10,10 +10,12 @@
         {% include 'allianceauth/admin-status/include.html' %}
     {% endif %}
     <div class="col-sm-12">
-        <div class="row vertical-flexbox-row">
+        <div class="row vertical-flexbox-row2">
             <div class="col-sm-6 text-center">
                 <div class="panel panel-primary" style="height:100%">
-                    <div class="panel-heading"><h3 class="panel-title">{% trans "Main Character" %}</h3></div>
+                    <div class="panel-heading">
+                        <h3 class="panel-title">{% trans "Main Character" %}</h3>
+                    </div>
                     <div class="panel-body">
                         {% if request.user.profile.main_character %}
                         {% with request.user.profile.main_character as main %}
@@ -25,12 +27,21 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="text-center">{{ main.character_name }}</td>
+                                    <td class="text-center">
+                                        <span class="hidden-xs">
+                                            {{ main.character_name }}
+                                        </span>
+                                        <span class="visible-xs-block">
+                                            <strong>{{ main.character_name }}</strong><br>
+                                            {{ main.corporation_name }}<br>
+                                            {{ main.alliance_name }}
+                                        </span>
+                                    </td>
                                 </tr>
                             </table>
                         </div>
                         <div class="col-lg-4 col-sm-2">
-                            <table class="table">
+                            <table class="table hidden-xs">
                                 <tr>
                                     <td class="text-center">
                                         <img class="ra-avatar"src="{{ main.corporation_logo_url_128 }}">
@@ -43,7 +54,7 @@
                         </div>
                         <div class="col-lg-4 col-sm-2">
                             {% if main.alliance_id %}
-                            <table class="table">
+                            <table class="table hidden-xs">
                                 <tr>
                                     <td class="text-center">
                                         <img class="ra-avatar"src="{{ main.alliance_logo_url_128 }}">
@@ -60,20 +71,24 @@
                         <div class="alert alert-danger" role="alert">{% trans "No main character set." %}</div>
                         {% endif %}
                         <div class="clearfix"></div>
-                        <div class="col-xs-6">
-                            <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
-                               title="Add Character">{% trans 'Add Character' %}</a>
-                        </div>
-                        <div class="col-xs-6">
-                            <a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info"
-                               title="Change Main Character">{% trans "Change Main" %}</a>
+                        <div class="row">
+                            <div class="col-sm-6 button-wrapper">
+                                <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
+                                title="Add Character">{% trans 'Add Character' %}</a>
+                            </div>
+                            <div class="col-sm-6 button-wrapper">
+                                <a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info"
+                                title="Change Main Character">{% trans "Change Main" %}</a>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
             <div class="col-sm-6 text-center">
                 <div class="panel panel-success" style="height:100%">
-                    <div class="panel-heading"><h3 class="panel-title">{% trans "Groups" %}</h3></div>
+                    <div class="panel-heading">
+                        <h3 class="panel-title">{% trans "Groups" %}</h3>
+                    </div>
                     <div class="panel-body">
                         <div style="height: 240px;overflow:-moz-scrollbars-vertical;overflow-y:auto;">
                             <table class="table table-striped">
@@ -90,26 +105,52 @@
         </div>
         <div class="clearfix"></div>
         <div class="panel panel-default">
-            <div class="panel-heading" style="display:flex;"><h3 class="panel-title">{% trans 'Characters' %}</h3></div>
-            <div class="panel-body">
-                <table class="table table-hover">
-                    <tr>
-                        <th class="text-center"></th>
-                        <th class="text-center">{% trans 'Name' %}</th>
-                        <th class="text-center">{% trans 'Corp' %}</th>
-                        <th class="text-center">{% trans 'Alliance' %}</th>
-                    </tr>
-                    {% for ownership in request.user.character_ownerships.all %}
-                    {% with ownership.character as char %}
-                    <tr>
-                        <td class="text-center"><img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
-                        </td>
-                        <td class="text-center">{{ char.character_name }}</td>
-                        <td class="text-center">{{ char.corporation_name }}</td>
-                        <td class="text-center">{{ char.alliance_name }}</td>
-                    </tr>
-                    {% endwith %}
-                    {% endfor %}
+            <div class="panel-heading">
+                <h3 class="panel-title text-center" style="text-align: center">
+                    {% trans 'Characters' %}
+                </h3>
+            </div>
+            <div class="panel-body">                
+                <table class="table table-striped hidden-xs">
+                    <thead>
+                        <tr>
+                            <th class="text-center"></th>
+                            <th class="text-center">{% trans 'Name' %}</th>
+                            <th class="text-center">{% trans 'Corp' %}</th>
+                            <th class="text-center">{% trans 'Alliance' %}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for ownership in request.user.character_ownerships.all %}
+                            {% with ownership.character as char %}
+                            <tr>
+                                <td class="text-center"><img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
+                                </td>
+                                <td class="text-center">{{ char.character_name }}</td>
+                                <td class="text-center">{{ char.corporation_name }}</td>
+                                <td class="text-center">{{ char.alliance_name }}</td>
+                            </tr>
+                            {% endwith %}
+                        {% endfor %}
+                    </tbody>
+                </table>
+                <table class="table table-striped visible-xs-block" style="width: 100%">
+                    <tbody>
+                        {% for ownership in request.user.character_ownerships.all %}
+                            {% with ownership.character as char %}
+                            <tr>
+                                <td class="text-center" style="vertical-align: middle">
+                                    <img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
+                                </td>
+                                <td class="text-center" style="vertical-align: middle; width: 100%">
+                                    <strong>{{ char.character_name }}</strong><br>
+                                    {{ char.corporation_name }}<br>
+                                    {{ char.alliance_name|default:"" }}
+                                </td> 
+                            </tr>
+                            {% endwith %}
+                        {% endfor %}
+                    </tbody>
                 </table>
             </div>
         </div>
diff --git a/allianceauth/authentication/templates/public/login.html b/allianceauth/authentication/templates/public/login.html
index 428365a8..0129d058 100644
--- a/allianceauth/authentication/templates/public/login.html
+++ b/allianceauth/authentication/templates/public/login.html
@@ -3,8 +3,8 @@
 {% block page_title %}Login{% endblock %}
 {% block middle_box_content %}
     <p style="text-align:center">
-        <a href="{% url 'auth_sso_login' %}{% if request.GET.next %}?next={{request.GET.next}}{%endif%}">
-            <img src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0>
+        <a href="{% url 'auth_sso_login' %}{% if request.GET.next %}?next={{request.GET.next}}{%endif%}">            
+            <img class="img-responsive" src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0>
         </a>
     </p>
 {% endblock %}
\ No newline at end of file
diff --git a/allianceauth/static/css/auth-base.css b/allianceauth/static/css/auth-base.css
index 7ce03d2a..cd069235 100644
--- a/allianceauth/static/css/auth-base.css
+++ b/allianceauth/static/css/auth-base.css
@@ -42,3 +42,28 @@ ul.list-group.list-group-horizontal > li.list-group-item {
 .flex-center-horizontal {
     justify-content: center;
 }
+
+/* Small devices (tablets, 768px and up) */
+@media (min-width: 768px) {
+    
+    /* class for vertically aligning columns in a bootstrap row */
+    .row.vertical-flexbox-row2 {
+        display:  -webkit-box;
+        display: -webkit-flex;
+        display:  -ms-flexbox;
+        display:         flex;
+        flex-wrap: wrap;
+      }
+      
+      .row.vertical-flexbox-row2 > [class*='col-'] {
+        display: flex;
+        flex-direction: column;
+      }
+}
+
+/* Extra Small devices (Phones, <768px) */
+@media (max-width: 767px) {
+    .button-wrapper .btn {
+        margin-bottom:5px;
+    }
+}
\ No newline at end of file
diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html
index 5c45b80c..af24cd2f 100644
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="col-sm-12">
-    <div class="row vertical-flexbox-row">
+    <div class="row vertical-flexbox-row2">
         <div class="col-sm-6">
             <div class="panel panel-primary" style="height:100%;position:relative;">
                 <div class="panel-heading text-center"><h3 class="panel-title">{% trans "Alliance Auth Notifications" %}</h3></div>
@@ -31,33 +31,36 @@
                 <div class="panel-body flex-center-horizontal">
                     <ul class="list-group list-group-horizontal" style="margin-bottom: 0;">
                         <li class="list-group-item">
-                            <h4 class="list-group-item-heading">{% trans "Current" %}</h4>
+                            <h5 class="list-group-item-heading">{% trans "Current" %}</h5>
                             <p class="list-group-item-text">
                                 {{ current_version }}
                             </p>
                         </li>
                         <li class="list-group-item list-group-item-{% if latest_major %}success{% else %}warning{% endif %}">
-                            <h4 class="list-group-item-heading">{% trans "Latest Major" %}</h4>
+                            <h5 class="list-group-item-heading">{% trans "Latest Major" %}</h5>
                             <p class="list-group-item-text">
-                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000"><i class="fa fa-gitlab" aria-hidden="true"></i>
+                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
+                                    <i class="fa fa-gitlab hidden-xs" aria-hidden="true"></i>
                                     {{ latest_major_version }}
                                 </a>
                                 {% if not latest_major %}<br>{% trans "Update available" %}{% endif %}
                             </p>
                         </li>
                         <li class="list-group-item list-group-item-{% if latest_minor %}success{% else %}warning{% endif %}">
-                            <h4 class="list-group-item-heading">{% trans "Latest Minor" %}</h4>
+                            <h5 class="list-group-item-heading">{% trans "Latest Minor" %}</h5>
                             <p class="list-group-item-text">
-                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000"><i class="fa fa-gitlab" aria-hidden="true"></i>
+                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
+                                    <i class="fa fa-gitlab hidden-xs" aria-hidden="true"></i>
                                     {{ latest_minor_version }}
                                 </a>
                                 {% if not latest_minor %}<br>{% trans "Update available" %}{% endif %}
                             </p>
                         </li>
                         <li class="list-group-item list-group-item-{% if latest_patch %}success{% else %}danger{% endif %}">
-                            <h4 class="list-group-item-heading">{% trans "Latest Patch" %}</h4>
+                            <h5 class="list-group-item-heading">{% trans "Latest Patch" %}</h5>
                             <p class="list-group-item-text">
-                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000"><i class="fa fa-gitlab" aria-hidden="true"></i>
+                                <a href="https://gitlab.com/allianceauth/allianceauth/tags" style="color:#000">
+                                    <i class="fa fa-gitlab hidden-xs" aria-hidden="true"></i>
                                     {{ latest_patch_version }}
                                 </a>
                                 {% if not latest_patch %}<br>{% trans "Update available" %}{% endif %}