diff --git a/src/views/TakeControl.vue b/src/views/TakeControl.vue
index a853da7..f240b8c 100644
--- a/src/views/TakeControl.vue
+++ b/src/views/TakeControl.vue
@@ -1,27 +1,119 @@
 <template>
-  <iframe
-    style="overflow:hidden;height:900px;"
-    :src="control"
-    width="100%"
-    height="100%"
-    scrolling="no"
-  ></iframe>
+  <div class="q-pa-none q-ma-none">
+    <div class="row q-pb-xs q-pl-md">
+      <span class="text-caption">
+        Agent Status:
+        <q-badge :color="statusColor" :label="status" />
+      </span>
+      <q-space />
+      <q-btn
+        class="q-mr-md"
+        color="primary"
+        size="sm"
+        label="Restart Connection"
+        icon="refresh"
+        @click="restart"
+      />
+      <q-btn
+        color="negative"
+        size="sm"
+        label="Recover Connection"
+        icon="fas fa-first-aid"
+        @click="repair"
+      />
+      <q-space />
+    </div>
+
+    <q-video v-show="visible" :ratio="16/9" :src="control"></q-video>
+  </div>
 </template>
 
 <script>
-import axios from "axios";
+import mixins from "@/mixins/mixins";
 
 export default {
   name: "TakeControl",
+  mixins: [mixins],
   data() {
     return {
       control: "",
+      visible: true,
+      status: null,
     };
   },
+  computed: {
+    statusColor() {
+      if (this.status !== null) {
+        let color;
+        switch (this.status) {
+          case "online":
+            color = "positive";
+            break;
+          case "offline":
+            color = "warning";
+            break;
+          case "overdue":
+            color = "negative";
+            break;
+        }
+        return color;
+      }
+    },
+  },
   methods: {
     genURL() {
-      const pk = this.$route.params.pk;
-      axios.get(`/agents/${pk}/meshcentral/`).then(r => (this.control = r.data.control));
+      this.$q.loading.show();
+      this.visible = false;
+      this.$axios
+        .get(`/agents/${this.$route.params.pk}/meshcentral/`)
+        .then(r => {
+          this.control = r.data.control;
+          this.status = r.data.status;
+          this.$q.loading.hide();
+          this.visible = true;
+        })
+        .catch(e => {
+          this.visible = true;
+          this.$q.loading.hide();
+          this.notifyError("Something went wrong");
+        });
+    },
+    restart() {
+      this.visible = false;
+      this.$q.loading.show({ message: "Restarting Mesh Agent" });
+      this.$axios
+        .get(`/agents/${this.$route.params.pk}/restartmesh/`)
+        .then(r => {
+          setTimeout(() => {
+            this.visible = true;
+            this.$q.loading.hide();
+            this.notifySuccess(r.data);
+          }, 500);
+        })
+        .catch(e => {
+          this.visible = true;
+          this.$q.loading.hide();
+          this.notifyError(e.response.data);
+        });
+    },
+    repair() {
+      this.visible = false;
+      this.$q.loading.show({ message: "Attempting to repair Mesh Agent" });
+      this.$axios
+        .get(`/agents/${this.$route.params.pk}/recovermesh/`)
+        .then(r => {
+          setTimeout(() => {
+            this.visible = true;
+            this.$q.loading.hide();
+            this.notifySuccess(r.data);
+            this.genURL();
+          }, 500);
+        })
+        .catch(e => {
+          this.visible = true;
+          this.$q.loading.hide();
+          this.notifyError(e.response.data);
+        });
     },
   },
   created() {