diff --git a/packages/frontend/src/components/admin/ActivityCard.vue b/packages/frontend/src/components/admin/ActivityCard.vue
index 5f804ea89..f0c788c59 100644
--- a/packages/frontend/src/components/admin/ActivityCard.vue
+++ b/packages/frontend/src/components/admin/ActivityCard.vue
@@ -78,29 +78,27 @@ export default {
           },
           labels: {
             show: true,
-            rotate: -25,
+            rotate: 0,
             rotateAlways: true,
-            hideOverlappingLabels: false,
-            showDuplicates: true,
+            hideOverlappingLabels: true,
+            showDuplicates: false,
             trim: false,
-            minHeight: undefined,
-            maxHeight: 120,
             style: {
               colors: [],
               fontSize: '12px',
               fontFamily: 'Helvetica, Arial, sans-serif',
               fontWeight: 400,
-              cssClass: 'apexcharts-xaxis-label'
+              cssClass: 'apexcharts-xaxis-label text-center'
             },
             offsetX: 0,
             offsetY: 0,
-            format: undefined,
-            formatter: undefined,
-            datetimeUTC: true,
-            datetimeFormatter: {
-              year: 'yyyy',
-              month: 'MMM yy'
-            }
+            // format: undefined,
+            // formatter: undefined,
+            // datetimeUTC: true,
+            // datetimeFormatter: {
+            //   year: 'yyyy',
+            //   month: 'M/yy'
+            // }
           }
         },
         yaxis: {
@@ -149,27 +147,22 @@ export default {
       var result = []
       var months = this.past12Months()
       if (this.serverStats) {
-        console.log(this.serverStats)
         result = Object.keys(this.serverStats).map((key) => {
           var category = this.serverStats[key]
-          console.log(key, category)
           var processed = []
           months?.forEach((month) => {
             var totalCount = 0
             category.forEach((value) => {
               var date = this.parseISOString(value.created_month)
               if (this.isSameMonth(month, date)) {
-                console.log(date.getTime())
                 totalCount = value.count
               }
             })
             processed.push([month, totalCount])
           })
-          console.log('processed', key, processed)
           return { name: key, data: processed }
         })
       }
-
       return result
     }
   },
@@ -181,7 +174,7 @@ export default {
       var now = new Date(Date.now())
       var dates = []
       for (let i = 0; i < 12; i++) {
-        var d = new Date(now.getFullYear(), now.getMonth() - i, 28)
+        var d = new Date(now.getFullYear(), now.getMonth() - i, 2)
         dates.push(d)
       }
       return dates
diff --git a/packages/frontend/src/components/admin/ServerInfoCard.vue b/packages/frontend/src/components/admin/ServerInfoCard.vue
index 35292e104..a60532f7f 100644
--- a/packages/frontend/src/components/admin/ServerInfoCard.vue
+++ b/packages/frontend/src/components/admin/ServerInfoCard.vue
@@ -16,21 +16,55 @@
     </template>
     <div v-if="serverInfo">
       <v-fade-transition mode="out-in">
-<!--        <div v-if="edit" key="editPanel">-->
-<!--          <v-card-text v-for="(value,name) in serverDetails" :key="name" class="pt-0 pb-0">-->
-<!--            <span v-if="name === 'inviteOnly'">-->
-<!--              {{ name }}-->
-<!--              <v-btn :disabled="edit" v-model="serverInfo['name']">Enable</v-btn>-->
-<!--            </span>-->
-<!--            <v-text-field v-else :hint="value.hint" :label="value.label" dense outlined v-model="serverInfo[name]"/>-->
-<!--          </v-card-text>-->
-<!--        </div>-->
+        <!--        <div v-if="edit" key="editPanel">-->
+        <!--          <v-card-text v-for="(value,name) in serverDetails" :key="name" class="pt-0 pb-0">-->
+        <!--            <span v-if="name === 'inviteOnly'">-->
+        <!--              {{ name }}-->
+        <!--              <v-btn :disabled="edit" v-model="serverInfo['name']">Enable</v-btn>-->
+        <!--            </span>-->
+        <!--            <v-text-field v-else :hint="value.hint" :label="value.label" dense outlined v-model="serverInfo[name]"/>-->
+        <!--          </v-card-text>-->
+        <!--        </div>-->
         <div key="viewPanel">
           <div class="d-flex align-center mb-2" v-for="(value,name) in serverDetails" :key="name">
-            <span class="cover-fill primary white--text pa-2 rounded border-primary mr-2" disabled style="min-width: 25%">{{ value.label }}</span>
-            <v-text-field dense v-if="edit" hide-details solo flat :hint="value.hint"  v-model="serverModifications[name]" class="ma-0 body-2 border-primary dashed primary--text">
-            </v-text-field>
-            <span v-else class="pa-2 pl-3 border-primary flex-grow-1 rounded">{{serverInfo[name] || '-'}}</span>
+            <span class="cover-fill primary white--text pa-2 rounded border-primary mr-2"
+                  disabled
+                  style="min-width: 25%">{{ value.label }}</span>
+            <div v-if="edit" class="flex-grow-1 rounded border-primary dashed primary--text">
+                <span v-if="value.type == 'boolean'">
+                <v-switch :disabled="!edit"
+                          hide-details
+                          flat
+                          v-model="serverModifications[name]"
+                          class="pa-1 ma-1 caption">
+                        <template v-slot:label>
+                          <span class="caption">{{ value.hint }}</span>
+                        </template>
+                </v-switch>
+              </span>
+              <v-text-field dense
+                            v-else
+                            hide-details
+                            solo
+                            flat
+                            :hint="value.hint"
+                            v-model="serverModifications[name]"
+                            class="ma-0 body-2"></v-text-field>
+            </div>
+            <span v-else class="pa-2 pl-3 border-primary flex-grow-1 rounded">
+              <span v-if="value.type == 'boolean'">
+                <v-switch :disabled="!edit"
+                          hide-details
+                          flat
+                          v-model="serverModifications[name]"
+                          class="pa-0 ma-0 caption">
+                        <template v-slot:label>
+                          <span class="caption">{{ value.hint }}</span>
+                        </template>
+                </v-switch>
+              </span>
+              <span v-else>{{ serverInfo[name] || "-" }}</span>
+            </span>
           </div>
         </div>
       </v-fade-transition>
@@ -48,9 +82,7 @@ export default {
   data() {
     return {
       edit: false,
-      serverModifications: {
-
-      },
+      serverModifications: {},
       serverDetails: {
         name: {
           label: "Name",
@@ -73,7 +105,9 @@ export default {
           hint: "Url pointing to the terms of service page"
         },
         inviteOnly: {
-          label: "Invite-Only mode"
+          label: "Invite-Only mode",
+          hint: "Only users with an invitation will be able to join",
+          type: "boolean"
         }
       }
     };
@@ -92,21 +126,24 @@ export default {
           }
         }
       `,
-      update(data){
-        delete data.serverInfo.__typename
-        this.serverModifications = data.serverInfo
-        return data.serverInfo
+      update(data) {
+        console.log("got apollo data", data);
+        delete data.serverInfo.__typename;
+        this.serverModifications = Object.assign({}, data.serverInfo);
+        return data.serverInfo;
       }
     }
   },
   methods: {
     cancelEdit() {
-      this.serverModifications = this.serverInfo
+      console.log("edit was cancelled");
+      this.serverModifications = Object.assign({}, this.serverInfo);
       this.edit = false;
       this.loading = false;
       this.saving = false;
     },
     async saveEdit() {
+      console.log("saving edits");
       await this.$apollo.mutate({
         mutation: gql`mutation($info: ServerInfoUpdateInput!) {
             serverInfoUpdate(info: $info)
@@ -115,8 +152,8 @@ export default {
           info: this.serverModifications
         }
       });
-      await this.$apollo.queries.serverInfo.refresh()
-      this.cancelEdit()
+      await this.$apollo.queries["serverInfo"].refetch();
+      this.cancelEdit();
     }
   }
 };
@@ -125,7 +162,8 @@ export default {
 <style scoped lang="scss">
 .border-primary {
   border: 1px solid var(--v-primary-base);
-  &.dashed{
+
+  &.dashed {
     border-style: dashed;
     border-width: 1px;
   }
diff --git a/packages/frontend/src/components/admin/VersionInfoCard.vue b/packages/frontend/src/components/admin/VersionInfoCard.vue
index 353c213c4..7fe077681 100644
--- a/packages/frontend/src/components/admin/VersionInfoCard.vue
+++ b/packages/frontend/src/components/admin/VersionInfoCard.vue
@@ -24,7 +24,7 @@
           {{ versionInfo.latest }} </p>
       </div>
     </div>
-    <v-btn v-if="!isLatestVersion" color="primary" width="100%">
+    <v-btn disabled v-if="!isLatestVersion" color="primary" width="100%">
       Follow our guide on how to update your server
     </v-btn>
   </admin-card>
diff --git a/packages/frontend/src/views/admin/AdminPanel.vue b/packages/frontend/src/views/admin/AdminPanel.vue
index 62bfb82bb..2d986dd01 100644
--- a/packages/frontend/src/views/admin/AdminPanel.vue
+++ b/packages/frontend/src/views/admin/AdminPanel.vue
@@ -41,16 +41,16 @@ export default {
           to: "/admin",
           icon: "mdi-view-dashboard"
         },
-        {
-          name: "Users",
-          to: "/admin/users",
-          icon: "mdi-account-multiple"
-        },
-        {
-          name: "Streams",
-          to: "/admin/streams",
-          icon: "mdi-cloud"
-        },
+        // {
+        //   name: "Users",
+        //   to: "/admin/users",
+        //   icon: "mdi-account-multiple"
+        // },
+        // {
+        //   name: "Streams",
+        //   to: "/admin/streams",
+        //   icon: "mdi-cloud"
+        // },
         {
           name: "Settings",
           to: "/admin/settings",
diff --git a/packages/frontend/src/views/admin/AdminSettings.vue b/packages/frontend/src/views/admin/AdminSettings.vue
index 95cfb9565..2cb3e7660 100644
--- a/packages/frontend/src/views/admin/AdminSettings.vue
+++ b/packages/frontend/src/views/admin/AdminSettings.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="admin-settings">
     <server-info-admin-card/>
-    <server-admins-card/>
+    <!--    <server-admins-card/>-->
   </div>
 </template>