diff --git a/ceremony/src/lib/components/Ceremony.svelte b/ceremony/src/lib/components/Ceremony.svelte
index a1b1ebb05d..5e643f5082 100644
--- a/ceremony/src/lib/components/Ceremony.svelte
+++ b/ceremony/src/lib/components/Ceremony.svelte
@@ -40,6 +40,8 @@ window.addEventListener("beforeunload", (e: BeforeUnloadEvent) => {
 
   {#if !contributor.userWallet}
     <Reward {contributor}/>
+  {:else if contributor.state === 'contributed'}
+    <Thanks {contributor}/>
   {:else if contributor.clientState === 'offline'}
     <Install {contributor}/>
   {:else if !contributor.downloadedSecret}
@@ -47,15 +49,13 @@ window.addEventListener("beforeunload", (e: BeforeUnloadEvent) => {
   {:else if contributor.state === "inQueue"}
     <Queue {contributor}/>
   {:else if contributor.state === 'contribute'}
-  <H1>Starting contribution...</H1>
+    <H1>Starting contribution...</H1>
   {:else if contributor.state === 'contributing'}
-  <H1>Contributing...</H1>
+    <H1>Contributing...</H1>
   {:else if contributor.state === 'verifying'}
-  <H1>Verifying your contribution...</H1>
-  {:else if contributor.state === 'contributed'}
-  <Thanks {contributor}/>
+    <H1>Verifying your contribution...</H1>
   {:else}
-  <H1>Not able to contribute at this time</H1>
+    <H1>Not able to contribute at this time</H1>
   {/if}
 
 </div>
diff --git a/ceremony/src/lib/components/Code.svelte b/ceremony/src/lib/components/Code.svelte
index 3cc439907c..b0421785d5 100644
--- a/ceremony/src/lib/components/Code.svelte
+++ b/ceremony/src/lib/components/Code.svelte
@@ -87,12 +87,7 @@ function handleKeyDown(event: KeyboardEvent, index: number) {
   {/each}
 </div>
 
-{#if secondary}
-  <Button class="bg-transparent text-white hover:text-white border-2 border-white hover:bg-neutral-800" loading={codeLoading} type="button" onclick={handleCodeJoin}>
+
+<Button variant={secondary ? "secondary" : "primary"} loading={codeLoading} type="button" onclick={handleCodeJoin}>
   Redeem code
-  </Button>
-{:else}
-  <Button loading={codeLoading} type="button" onclick={handleCodeJoin}>
-    Redeem code
-  </Button>
-{/if}
+</Button>