diff --git a/layouts/default.vue b/layouts/default.vue
index 209425ae..63951877 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -4,13 +4,15 @@
     <Confirm/>
     <Nav/>
     <v-main app>
-      <div class="ml-1 mb-1 mt-1" v-if='showCohorts || showBack'>
-        <v-btn v-show='showBack' text color='primary' to='/'><v-icon v-text='mdiChevronLeft'/></v-btn>
-        <v-btn v-for='cohort in cohorts' text color='primary' :key='cohort.id' :to='`/g/${cohort.name}`'>{{cohort.name}}</v-btn>
-      </div>      
-      <v-fade-transition hide-on-leave>
-        <nuxt />
-      </v-fade-transition>
+      <v-container fluid class='pa-0'>
+        <div v-if='showCohorts || showBack'>
+          <v-btn class='ml-2 mt-2' v-if='showBack' outlined color='primary' to='/'><v-icon v-text='mdiChevronLeft'></v-icon></v-btn>
+          <v-btn class='ml-2 mt-2' outlined v-for='cohort in cohorts' color='primary' :key='cohort.id' :to='`/g/${cohort.name}`'>{{cohort.name}}</v-btn>
+        </div>
+        <v-fade-transition hide-on-leave>
+          <nuxt />
+        </v-fade-transition>
+      </v-container>
     </v-main>
     <Footer/>
 
diff --git a/layouts/error.vue b/layouts/error.vue
index 25e0c6d9..825bed21 100644
--- a/layouts/error.vue
+++ b/layouts/error.vue
@@ -1,9 +1,9 @@
 <template lang='pug'>
-  v-container.p-4.text-center
-    v-alert(v-if="error.statusCode === 404" type='error' :icon='mdiAlert') ¯\_(ツ)_/¯ {{error.message}}
-    v-alert(v-else type='error' :icon='mdiAlert') An error occurred: {{error.message}}
-    nuxt-link(to='/')
-      v-btn Back to home
+v-container.pa-2.text-center
+  v-alert(v-if="error.statusCode === 404" type='error' :icon='mdiAlert') ¯\_(ツ)_/¯ {{error.message}}
+  v-alert.mb-2(v-else type='error' :icon='mdiAlert') An error occurred: {{error.message}}
+  nuxt-link(to='/')
+    v-btn(outlined color='primary') Back to home
 </template>
 
 <script>
diff --git a/pages/g/_cohort.vue b/pages/g/_cohort.vue
index 308b2339..fadc7b68 100644
--- a/pages/g/_cohort.vue
+++ b/pages/g/_cohort.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container id='home' fluid>
+  <v-container class='px-0' fluid>
 
     <h1 class='d-block text-h3 font-weight-black text-center align-center text-uppercase mt-10 mb-12 mx-auto w-100 text-underline'><u>{{cohort}}</u></h1>
 
diff --git a/pages/index.vue b/pages/index.vue
index 43bb72d8..cce711f1 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,8 +1,8 @@
 <template lang="pug">
-v-container#home(fluid)
+v-container.pa-0
 
   //- Announcements
-  #announcements.mx-1.mt-1(v-if='announcements.length')
+  #announcements.ma-2(v-if='announcements.length')
     Announcement(v-for='announcement in announcements' :key='`a_${announcement.id}`' :announcement='announcement')
 
   //- Calendar and search bar
diff --git a/pages/p/_place.vue b/pages/p/_place.vue
index 47792734..57779cf7 100644
--- a/pages/p/_place.vue
+++ b/pages/p/_place.vue
@@ -1,7 +1,6 @@
 <template>
-  <v-container id='home' fluid>
-
-    <h1 class='d-block text-h4 font-weight-black text-center text-uppercase mt-5 mx-auto w-100 text-underline'><u>{{place.name}}</u></h1>
+  <v-container class='px-0' fluid>
+    <h1 class='d-block text-h4 font-weight-black text-center text-uppercase mt-10 mx-auto w-100 text-underline'><u>{{place.name}}</u></h1>
     <span class="d-block text-subtitle text-center w-100 mb-14">{{place.address}}</span>
 
     <!-- Events -->
diff --git a/pages/tag/_tag.vue b/pages/tag/_tag.vue
index 96196e57..3ee1e7e4 100644
--- a/pages/tag/_tag.vue
+++ b/pages/tag/_tag.vue
@@ -1,7 +1,7 @@
 <template>
-  <v-container id='home' fluid>
+  <v-container class='px-0' fluid>
 
-    <h1 class='d-block text-h3 font-weight-black text-center align-center text-uppercase mt-5 mb-16 mx-auto w-100 text-underline'><u>{{tag}}</u></h1>
+    <h1 class='d-block text-h3 font-weight-black text-center text-uppercase mt-10 mb-16 mx-auto w-100 text-underline'><u>{{tag}}</u></h1>
 
     <!-- Events -->
     <div class="mb-2 mt-1 pl-1 pl-sm-2" id="events">
diff --git a/server/api/controller/cohort.js b/server/api/controller/cohort.js
index 6be7ed8d..5df1714b 100644
--- a/server/api/controller/cohort.js
+++ b/server/api/controller/cohort.js
@@ -31,7 +31,7 @@ const cohortController = {
     const name = req.params.name
 
     const cohort = await Cohort.findOne({ where: { name } })
-    if (!cohort) { 
+    if (!cohort) {
       return res.sendStatus(404)
     }
     const filters = await Filter.findAll({ where: { cohortId: cohort.id } })