diff --git a/lms/static/sass/base/_layouts.scss b/lms/static/sass/base/_layouts.scss
index d4579becdc..f05343a6c0 100644
--- a/lms/static/sass/base/_layouts.scss
+++ b/lms/static/sass/base/_layouts.scss
@@ -55,7 +55,9 @@ body.view-incourse {
 
   // courseware and progress page
   .course-wrapper,
-  .profile-wrapper {
+  .profile-wrapper,
+  .instructor-dashboard-wrapper-2,
+  .wiki-wrapper {
     max-width: 1180px;
     margin: 0 auto;
     padding: 0;
diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss
index 0d3b06d7bd..39a388b7ee 100644
--- a/lms/static/sass/shared/_header.scss
+++ b/lms/static/sass/shared/_header.scss
@@ -115,8 +115,8 @@ header.global {
   .user {
     @include float(right);
     @extend %ui-print-excluded;
-
     margin-top: ($baseline/4);
+    padding-left: 0;
 
     > .primary {
       display: block;
diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html
index 6c79a09b31..457dd672ed 100644
--- a/lms/templates/main_django.html
+++ b/lms/templates/main_django.html
@@ -27,30 +27,33 @@
 </head>
 
 <body class="{% block bodyclass %}{% endblock %} lang_{{LANGUAGE_CODE}}">
-  <a class="nav-skip" href="{% block nav_skip %}#content{% endblock %}">{% trans "Skip to main content" %}</a>
-  {% with course=request.course %}
-    {% if IS_EDX_DOMAIN %}
-      {% include "navigation-edx.html" %}
+  <div class="window-wrap" dir="${static.dir_rtl()}">
+    <a class="nav-skip" href="{% block nav_skip %}#content{% endblock %}">{% trans "Skip to main content" %}</a>
+    {% with course=request.course %}
+      {% if IS_EDX_DOMAIN %}
+        {% include "navigation-edx.html" %}
+      {% else %}
+        {% include "navigation.html" %}
+      {% endif %}
+    {% endwith %}
+    <div class="content-wrapper" id="content">
+      {% block body %}{% endblock %}
+      {% block bodyextra %}{% endblock %}
+    </div>
+    {% if IS_REQUEST_IN_MICROSITE %}
+    {# For now we don't support overriden Django templates in microsites. Leave footer blank for now which is better than saying Edx.#}
+    {% elif IS_EDX_DOMAIN %}
+      {% include "footer-edx-v3.html" %}
     {% else %}
-      {% include "navigation.html" %}
+      {% include "footer.html" %}
     {% endif %}
-  {% endwith %}
-  <div class="content-wrapper" id="content">
-    {% block body %}{% endblock %}
-    {% block bodyextra %}{% endblock %}
+
   </div>
-  {% if IS_REQUEST_IN_MICROSITE %}
-  {# For now we don't support overriden Django templates in microsites. Leave footer blank for now which is better than saying Edx.#}
-  {% elif IS_EDX_DOMAIN %}
-    {% include "footer-edx-v3.html" %}
-  {% else %}
-    {% include "footer.html" %}
-  {% endif %}
 
-  {% compressed_js 'application' %}
-  {% compressed_js 'module-js' %}
+    {% compressed_js 'application' %}
+    {% compressed_js 'module-js' %}
 
-  {% render_block "js" %}
+    {% render_block "js" %}
 </body>
 </html>
 
