diff --git a/client/src/components/FilterBar.vue b/client/src/components/FilterBar.vue
index f3e6e799..b1fcfc7c 100644
--- a/client/src/components/FilterBar.vue
+++ b/client/src/components/FilterBar.vue
@@ -72,7 +72,6 @@
     display: flex;
     align-items: center;
     justify-items: left;
-    grid-column: span 3;
     border: 1px solid rgba(228, 228, 228, 0.9);
     border-left: 0;
     border-right: 0;
diff --git a/client/src/components/modules/ModuleNavigation.vue b/client/src/components/modules/ModuleNavigation.vue
index 184c94cb..88afde4e 100644
--- a/client/src/components/modules/ModuleNavigation.vue
+++ b/client/src/components/modules/ModuleNavigation.vue
@@ -31,7 +31,7 @@
             :key="assignment.id"
             class="module-navigation__anchor"
             exact-active-class="module-navigation__anchor--active"
-          >{{assignment.title}}
+          >{{assignmentTitle(assignment)}}
           </router-link>
         </div>
       </div>
@@ -67,7 +67,10 @@
 
     data() {
       return {
-        module: {}
+        module: {},
+        me: {
+          permissions: []
+        }
       }
     },
 
@@ -77,6 +80,9 @@
       },
       submissionsLink(assignment) {
         return `/module/${this.module.slug}/submissions/${assignment.id}`;
+      },
+      assignmentTitle(assignment) {
+        return assignment.title.length > 25 ? assignment.title.substring(0, 22) + '...' : assignment.title;
       }
     }
   }
diff --git a/client/src/pages/module-base.vue b/client/src/pages/module-base.vue
index 5ad13f6b..0b02eed6 100644
--- a/client/src/pages/module-base.vue
+++ b/client/src/pages/module-base.vue
@@ -22,7 +22,7 @@
       display: grid;
     }
     justify-items: center;
-    grid-template-columns: 2fr 6fr 2fr;
+    grid-template-columns: 400px 1fr 400px;
 
     /*
      * For IE10+