diff --git a/sass/_blog.scss b/sass/_blog.scss
index 81e3c7d..a71d319 100644
--- a/sass/_blog.scss
+++ b/sass/_blog.scss
@@ -118,4 +118,12 @@ input#search::placeholder{
 .footer{
     margin-top: 4rem;
     padding: 2rem;
+}
+
+.pagination-previous, .pagination-next {
+    flex-grow: 0;
+}
+
+.theme-select-container{
+    margin-left:auto;
 }
\ No newline at end of file
diff --git a/static/js/switchcss.js b/static/js/switchcss.js
index 9866bf3..d2d744e 100644
--- a/static/js/switchcss.js
+++ b/static/js/switchcss.js
@@ -16,6 +16,7 @@ function changeTheme(themeName) {
     document.querySelectorAll('link.stylesheet').forEach(element => {
         if (element.id === themeName) {
             element.disabled = false;
+            element.media = '';
         }
         else {
             alternates.push(element);
@@ -24,6 +25,7 @@ function changeTheme(themeName) {
 
     alternates.forEach(element => {
         element.disabled = true;
+        element.media = 'none';
     });
 
     saveTheme(themeName);
diff --git a/templates/index_macros.html b/templates/index_macros.html
index 134b2e9..8c0c90e 100644
--- a/templates/index_macros.html
+++ b/templates/index_macros.html
@@ -99,8 +99,8 @@
 <footer class="footer js-only">
     <div class="columns">
         <div class="column">
-            <div class="content">
-                <div class="is-pulled-right">
+            <div class="content is-flex">
+                <div class="theme-select-container">
                     Theme:
                     <select id="theme-select">
                         {% for theme in config.extra.zulma_themes %}
@@ -136,7 +136,7 @@
 <link id="{{theme}}" class="stylesheet" rel="stylesheet"
     href="{{ get_url(path=theme ~ ".css", trailing_slash=false) }}" />
 {% else %}
-<link id="{{theme}}" class="alternate stylesheet" disabled rel="stylesheet"
+<link id="{{theme}}" class="alternate stylesheet" media="none" rel="stylesheet"
     href="{{ get_url(path=theme ~ ".css", trailing_slash=false) }}" />
 {% endif %}
 {% endfor %}