diff --git a/src/components/Attestation.vue b/src/components/Attestation.vue
new file mode 100644
index 0000000..c3a30bf
--- /dev/null
+++ b/src/components/Attestation.vue
@@ -0,0 +1,38 @@
+<template>
+  <el-row :gutter="15">
+    <el-col v-for="(key, i) in user_attestation" :key="i">
+      <el-card>
+        <template #header>
+          <span>{{ key }}</span>
+        </template>
+        <div v-if="Boolean(attestation)" class="text-break text-small">
+          {{ attestation[key] }}
+        </div>
+      </el-card>
+    </el-col>
+  </el-row>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+import { mapState } from "vuex";
+
+export default defineComponent({
+  data() {
+    return {
+      user_attestation: ["mrsigner", "mrenclave"]
+    };
+  },
+  computed: {
+    ...mapState({
+      attestation: "attestationResult"
+    })
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.el-col {
+  margin-bottom: 10px;
+}
+</style>
diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue
index 4d6e59f..d2110e8 100644
--- a/src/components/FileUpload.vue
+++ b/src/components/FileUpload.vue
@@ -5,8 +5,8 @@
         <el-button
           size="small"
           type="primary"
-          :disabled="
-            Boolean(
+          v-if="
+            !Boolean(
               state._file.state ||
                 state._file.state === 'success' ||
                 state._file.state === 'error'
diff --git a/src/components/JwtDisplay.vue b/src/components/JwtDisplay.vue
new file mode 100644
index 0000000..6da0b80
--- /dev/null
+++ b/src/components/JwtDisplay.vue
@@ -0,0 +1,81 @@
+<template>
+  <el-card v-loading="busy.fetchingToken || Boolean(!jwtToken)">
+    <template #header>
+      <div class="card-header">
+        <span>JWT Token</span>
+        <span>
+          <el-button size="small" @click="getAttestation()"> Fetch </el-button>
+          <el-button
+            size="small"
+            type="primary"
+            @click="copy(jwtToken)"
+            :disabled="Boolean(!jwtToken)"
+          >
+            Copy
+          </el-button>
+        </span>
+      </div>
+    </template>
+    <div class="text-break text-small">
+      {{ jwtToken }}
+    </div>
+  </el-card>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+import useClipboard from "vue-clipboard3";
+import { ElNotification } from "element-plus";
+import { mapActions, mapState } from "vuex";
+
+export default defineComponent({
+  data() {
+    return {
+      busy: { fetchingToken: false }
+    };
+  },
+  setup() {
+    const { toClipboard } = useClipboard();
+
+    const copy = async (token: string) => {
+      try {
+        await toClipboard(token);
+        console.log("Copied to clipboard");
+        ElNotification({
+          type: "success",
+          message: "Copied to clipboard",
+          duration: 2500
+        });
+      } catch (e) {
+        ElNotification({
+          type: "error",
+          message: e
+        });
+      }
+    };
+
+    return { copy };
+  },
+  computed: {
+    ...mapState({
+      jwtToken: "jwtToken"
+    })
+  },
+  methods: {
+    ...mapActions(["requestAttestation"]),
+    async getAttestation() {
+      this.busy.fetchingToken = true;
+      await this.requestAttestation();
+      this.busy.fetchingToken = false;
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 52084cc..59a3c67 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -2,120 +2,37 @@
   <el-main>
     <el-row :gutter="10">
       <el-col :span="16">
-        <el-card v-loading="busy.fetchingToken">
-          <template #header>
-            <div class="card-header">
-              <span>JWT Token</span>
-              <span>
-                <el-button size="small" @click="getAttestation()">
-                  Fetch
-                </el-button>
-                <el-button
-                  size="small"
-                  type="primary"
-                  @click="copy($store.state.jwtToken)"
-                  :disabled="Boolean(!$store.state.jwtToken)"
-                >
-                  Copy
-                </el-button>
-              </span>
-            </div>
-          </template>
-          <div class="text-break text-small">
-            {{ $store.state.jwtToken }}
-          </div>
-        </el-card>
+        <JwtDisplay />
       </el-col>
       <el-col :span="8">
-        <el-row :gutter="15">
-          <el-col v-for="(key, i) in user_attestation" :key="i">
-            <el-card>
-              <template #header>
-                <span>{{ key }}</span>
-              </template>
-              <div class="text-break text-small">
-                {{ attestation[key] }}
-              </div>
-            </el-card>
-          </el-col>
-        </el-row>
-        <div>
-          <FileUpload />
-        </div>
+        <Attestation />
+        <FileUpload />
       </el-col>
     </el-row>
   </el-main>
 </template>
 
-<style lang="scss" scoped>
-.el-col {
-  margin-bottom: 10px;
-}
-.card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-</style>
-
 <script lang="ts">
 import { defineComponent } from "vue";
-import useClipboard from "vue-clipboard3";
 import FileUpload from "@/components/FileUpload.vue";
-import { ElNotification } from "element-plus";
-import { mapActions, mapState } from "vuex";
+import JwtDisplay from "@/components/JwtDisplay.vue";
+import Attestation from "@/components/Attestation.vue";
+import { mapActions } from "vuex";
 
 export default defineComponent({
   name: "Home",
   components: {
-    FileUpload
-  },
-  data() {
-    return {
-      attestation: {},
-      user_attestation: ["mrsigner", "mrenclave"],
-      busy: { fetchingToken: false }
-    };
-  },
-  setup() {
-    const { toClipboard } = useClipboard();
-
-    const copy = async (token: string) => {
-      try {
-        await toClipboard(token);
-        console.log("Copied to clipboard");
-        ElNotification({
-          type: "success",
-          message: "Copied to clipboard",
-          duration: 2500
-        });
-      } catch (e) {
-        ElNotification({
-          type: "error",
-          message: e
-        });
-      }
-    };
-
-    return { copy };
+    Attestation,
+    FileUpload,
+    JwtDisplay
   },
   async mounted() {
     await this.getAttestation();
   },
-  computed: {
-    ...mapState({
-      attestationResult: "attestationResult",
-      jwtToken: "jwtToken"
-    })
-  },
   methods: {
     ...mapActions(["requestAttestation"]),
     async getAttestation() {
-      this.busy.fetchingToken = true;
       await this.requestAttestation();
-      this.attestation = this.attestationResult;
-      console.log("Home.getAttestation result:", this.attestationResult);
-      this.busy.fetchingToken = false;
     }
   }
 });