diff --git a/ilpycon/templates/site_base.html b/ilpycon/templates/site_base.html
index 8ad59ef..1c07936 100644
--- a/ilpycon/templates/site_base.html
+++ b/ilpycon/templates/site_base.html
@@ -30,7 +30,7 @@
 
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 {% block nav %}
-                    <ul class="navbar-nav mr-auto">
+                    <ul class="navbar-nav {% if LANGUAGE_BIDI %}ml-auto{% else %}mr-auto{% endif %}">
                         {% block nav_items %}
                         {% sitetree_menu from "main" include "trunk" %}
                         {% if request.user.is_authenticated %}
diff --git a/static/src/scss/_body.scss b/static/src/scss/_body.scss
index 4db1a0a..486856c 100644
--- a/static/src/scss/_body.scss
+++ b/static/src/scss/_body.scss
@@ -3,6 +3,7 @@ body {
   flex-direction: column;
   min-height: 100vh;
   background: $background;
+  text-align: start;
 }
 main {
   margin-top: 20px;