diff --git a/templates/base.html b/templates/base.html
index 91b6e07..8a4d39f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -131,17 +131,23 @@
     <footer class="uk-align-center uk-container-large">
         <div class="uk-background-secondary uk-padding-small uk-light uk-text-center uk-text-light">
             &copy; {% now "Y" %} Powered by <a href="https://git.hakkeri.net/nyymix/muistox">muistox</a>.
-            Language:
-            <form class="language-switcher-form" action="{% url 'set_language' %}" method="post">
+            {% if LANGUAGE_CODE == 'fi' %}
+            <form class="language-switcher-form" action="{% url 'set_language' %}" method="post"
+                style="display:inline;">
                 {% csrf_token %}
-                <button type="submit" name="language" value="en"
-                    aria-label="Change language to English">English</button>
+                <button type="submit" name="language" value="en" aria-label="{% trans 'Change language to English' %}">
+                    In English
+                </button>
             </form>
-            |
-            <form class="language-switcher-form" action="{% url 'set_language' %}" method="post">
+            {% elif LANGUAGE_CODE == 'en' %}
+            <form class="language-switcher-form" action="{% url 'set_language' %}" method="post"
+                style="display:inline;">
                 {% csrf_token %}
-                <button type="submit" name="language" value="fi" aria-label="Vaihda kieli suomeksi">Suomi</button>
+                <button type="submit" name="language" value="fi" aria-label="{% trans 'Change language to Finnish' %}">
+                    Suomeksi
+                </button>
             </form>
+            {% endif %}
         </div>
     </footer>  
 
@@ -150,6 +156,12 @@
     <script src="https://cdn.jsdelivr.net/npm/uikit@3.23.6/dist/js/uikit-icons.min.js"></script>    
     <!-- Muistox JS -->
     <script src="{% static 'js/muistox.js' %}"></script>
+    <script>
+        function changeLanguage(lang) {
+            document.getElementById('language-input').value = lang;
+            document.getElementById('language-form').submit();
+        }
+    </script>
 </body>
 
 </html>
\ No newline at end of file