diff --git a/src/components/modals/CardviewModal.vue b/src/components/modals/CardviewModal.vue
index 5af0a185..19bdbdb4 100644
--- a/src/components/modals/CardviewModal.vue
+++ b/src/components/modals/CardviewModal.vue
@@ -22,7 +22,8 @@
           />
         </div>
       </div>
-      <div>
+
+      <div v-show="!state.isTransferModalVisible">
         <p class="font-bold text-2xl">
           Advanced Card Information
         </p>
@@ -51,9 +52,18 @@
         </p>
         <br>
       </div>
-      <div>
+
+      <div v-show="!state.isTransferModalVisible">
         <KeywordComponent :card="state.card" />
       </div>
+
+      <TransferCardModal
+        v-show="state.isTransferModalVisible"
+        :card="String(props.id)"
+        @close="closeModal"
+      />
+
+
     </div>
     <div
       class="flex flex-col lg:flex-row justify-center lg:justify-end space-y-6 lg:space-x-6 lg:space-y-0"
@@ -66,14 +76,7 @@
         </BaseCCButton>
       </router-link>
       <BaseCCButton
-        v-if="isArtist"
-        :type="Color.RED"
-        @click="edit()"
-      >
-        Edit artwork
-      </BaseCCButton>
-      <BaseCCButton
-        v-if="isOwner"
+        v-if="isOwner || isArtist"
         :type="Color.RED"
         @click="edit()"
       >
@@ -82,17 +85,12 @@
       <BaseCCButton
         v-if="isOwner"
         :type="Color.RED"
-        @click="showModal()"
+        @click="showTransferModal()"
       >
         Transfer card
       </BaseCCButton>
     </div>
   </ModalFrame>
-  <TransferCardModal
-    v-show="state.isModalVisible"
-    :card="String(props.id)"
-    @close="closeModal"
-  />
 </template>
 
 <script setup lang="ts">
@@ -119,10 +117,10 @@ const router = useRouter();
 const emit = defineEmits(["close"]);
 
 const initialState: {
-  isModalVisible: boolean;
+  isTransferModalVisible: boolean;
   card: Card;
 } = {
-  isModalVisible: false,
+  isTransferModalVisible: false,
   card: new Card(),
 };
 
@@ -155,9 +153,12 @@ const edit = () => {
   editCard.card.value = state.card;
   router.push("/cardCreator");
 };
-const showModal = () => (state.isModalVisible = true);
+const showTransferModal = () => {
+  state.isTransferModalVisible = true;
+  console.log("modal?", state.isTransferModalVisible)
+}
 const closeModal = () => {
-  state.isModalVisible = false;
+  state.isTransferModalVisible = false;
   loadCard();
 };
 </script>
diff --git a/src/components/modals/GalleryModal.vue b/src/components/modals/GalleryModal.vue
deleted file mode 100644
index 51c883c9..00000000
--- a/src/components/modals/GalleryModal.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <transition name="modal-fade">
-    <div class="modal__backdrop">
-      <div
-        aria-describedby="modalDescription"
-        aria-labelledby="modalTitle"
-        class="modal"
-        role="dialog"
-      >
-        <header
-          id="modalTitle"
-          class="modal__header"
-        >
-          <slot name="header">
-            Card Info & Interactions
-            <button
-              aria-label="Close modal"
-              class="btn--close"
-              type="button"
-              @click="close"
-            >
-              x
-            </button>
-          </slot>
-        </header>
-
-        <div class="container-flex-row">
-          <div>
-            <CardComponent
-              :model="model"
-              :image-u-r-l="imageURL"
-              hover-behavior="none"
-              class="view__card"
-            />
-          </div>
-
-          <div class="container-flex-column">
-            <div
-              v-show="keywordDescriptions.length"
-              class="modal__body"
-            >
-              <b>Keyword Explanations:</b>
-              <div
-                v-for="(keyword, index) in keywordDescriptions"
-                :key="index"
-                class="container-flex-row"
-              >
-                <b> {{ keyword[0] }}</b>
-                - {{ keyword[1] }}
-              </div>
-            </div>
-
-            <div class="modal__body no__bottomline">
-              <b>Card Interactions:</b>
-            </div>
-
-            <section
-              id="modalDescription"
-              class="modal__body choice-grid"
-            >
-              <router-link :to="{ path: '/cardview/' + model.id }">
-                <button
-                  aria-label="Close modal"
-                  class="choice-grid__button"
-                  type="button"
-                >
-                  Advanced Card Info
-                </button>
-              </router-link>
-              <button
-                v-if="isArtist && !isOwner"
-                aria-label="Close modal"
-                class="choice-grid__button"
-                type="button"
-                @click="
-                  edit();
-                  close();
-                "
-              >
-                Edit artwork
-              </button>
-              <button
-                v-if="isOwner"
-                aria-label="Close modal"
-                class="choice-grid__button"
-                type="button"
-                @click="
-                  edit();
-                  close();
-                "
-              >
-                Edit card
-              </button>
-              <button
-                v-if="isOwner"
-                class="choice-grid__button"
-                type="button"
-                @click="showModal()"
-              >
-                Transfer card
-              </button>
-              <button
-                v-if="canVote"
-                aria-label="Close modal"
-                class="choice-grid__button"
-                type="button"
-                @click="vote(VoteType.underpowered)"
-              >
-                Vote Underpowered
-              </button>
-
-              <button
-                v-if="canVote"
-                aria-label="Close modal"
-                class="choice-grid__button"
-                type="button"
-                @click="vote(VoteType.overpowered)"
-              >
-                Vote Overpowered
-              </button>
-
-              <button
-                v-if="canVote"
-                aria-label="Close modal"
-                class="choice-grid__button"
-                type="button"
-                @click="vote(VoteType.fairEnough)"
-              >
-                Vote Fair Enough
-              </button>
-
-              <button
-                v-if="canVote"
-                aria-label="Close modal"
-                class="choice-grid__button"
-                type="button"
-                @click="vote(VoteType.inappropriate)"
-              >
-                Vote Inappropriate
-              </button>
-              <button
-                aria-label="Close modal"
-                class="choice-grid__button"
-                type="button"
-                @click="
-                  $router.push({
-                    name: 'UserView',
-                    params: { id: model.owner },
-                  })
-                "
-              >
-                Owner profile
-              </button>
-            </section>
-          </div>
-        </div>
-        <TransferCardModal
-          v-show="state.isModalVisible"
-          :card="model.id.toString()"
-          @close="closeModal"
-        />
-        <footer class="modal__footer" />
-      </div>
-    </div>
-  </transition>
-</template>
-<script setup lang="ts">
-import CardComponent from "@/components/elements/CardComponent.vue";
-import { useLastInputEvent } from "@/def-composables/useLastInputEvent";
-import TransferCardModal from "./TransferCardModal.vue";
-import { useUser } from "@/def-composables/useUser";
-import { Card } from "@/model/Card";
-import { computed, reactive, watch } from "vue";
-import { useVoting } from "@/def-composables/useVoting";
-import { VoteType } from "decentralcardgame-cardchain-client-ts/DecentralCardGame.cardchain.cardchain/types/cardchain/cardchain/voting";
-import { useAddress } from "@/def-composables/useAddress";
-
-const { add, send, isEmpty, cardsLeft, current } = useVoting();
-const { lastInputEvent } = useLastInputEvent();
-const { queryCoins, queryUser } = useUser();
-const { address } = useAddress()
-
-const emit = defineEmits(["close", "cardview", "edit"]);
-
-const props = withDefaults(
-  defineProps<{
-    keywordDescriptions: Array<Array<string>>;
-    model: Card;
-    imageURL: string;
-  }>(),
-  {
-    keywordDescriptions: () => [],
-    model: () => new Card(),
-    imageURL: "",
-  }
-);
-
-const initialState: {
-  isModalVisible: boolean;
-} = {
-  isModalVisible: false,
-};
-
-const canVote = computed(() => cardsLeft.value.includes(Number(props.model.id)))
-const isOwner = computed(() => props.model.owner == address.value)
-const isArtist = computed(() => props.model.artist == address.value)
-const state = reactive(initialState);
-
-watch(lastInputEvent, (event) => {
-  if (event.which == 27) {
-    emit("close");
-  }
-});
-
-const close = () => emit("close");
-const cardview = () => emit("cardview");
-const edit = () => emit("edit");
-
-const vote = (type: VoteType) => {
-  add(props.model.id, type);
-  send(
-    () => {
-    },
-    (err) => {
-      console.log(err);
-    }
-  );
-  close();
-};
-const showModal = () => {
-  state.isModalVisible = true;
-};
-const closeModal = () => {
-  state.isModalVisible = false;
-  queryUser();
-  queryCoins();
-};
-</script>
diff --git a/src/components/modals/TransferCardModal.vue b/src/components/modals/TransferCardModal.vue
index 79cec9e2..9862aa26 100644
--- a/src/components/modals/TransferCardModal.vue
+++ b/src/components/modals/TransferCardModal.vue
@@ -1,96 +1,82 @@
 <template>
-  <transition name="modal-fade">
+  <div>
+    <p class="font-bold text-2xl">
+      Transfer Card
+    </p>
+    <br>
+    This will transfer the Card Prototype to someone else permanently
     <div
-      class="modal__backdrop"
-      style="z-index: 1000;"
+      class="w-[27.3rem] ml-[2.1rem] mt-3 bg-zinc-300 bg-opacity-20 shadow-inner"
     >
-      <div
-        aria-describedby="modalDescription"
-        aria-labelledby="modalTitle"
-        class="modal"
-        role="dialog"
+      <input
+        v-model="state.recipient"
+        class="w-full py-3 px-2 mx-3 bg-transparent text-white text-opacity-100 text-s focus:border-black border-0 border-solid focus:outline-none focus:ring-0 placeholder-white placeholder-opacity-50"
+        placeholder="Add the receiver's wallet address"
+        maxLength="41"
       >
-        <header
-          id="modalTitle"
-          class="modal__header"
-        >
-          <slot name="header">
-            Transfer card
-          </slot>
-          <button
-            aria-label="Close modal"
-            type="button"
-            class="btn--close"
-            @click="close"
-          >
-            x
-          </button>
-        </header>
-        <div class="modal__body input--transfer">
-          Transfer card {{ card }} to
-          <input
-            v-model="recipient"
-            type="text"
-            placeholder="'recipient'"
-          >
-          <button
-            class="btn--default"
-            @click="send"
-          >
-            Send
-          </button>
-          <a
-            v-show="warningText"
-            class="warning"
-          >
-            <br>{{ warningText }}
-          </a>
-        </div>
-      </div>
     </div>
-  </transition>
+    <div v-if="!state.validAddress"
+      class="ml-[2.1rem]">
+      <br>
+      ADDRESS IS INVALID
+    </div>
+    <div class="mt-3 ml-[2.1rem]">
+      <BaseCCButton
+        :type="Color.RED"
+        @click="transfer()"
+      >
+        Transfer Card
+      </BaseCCButton>
+    </div>
+  </div>
 </template>
 
-<script lang=ts>
+<script setup lang=ts>
 
 import { validAddress } from "@/utils/validation";
+import { reactive } from "vue";
 import { useTx } from "@/def-composables/useTx";
+import { Color } from "@/components/utils/color";
+import BaseCCButton from "@/components/elements/CCButton/BaseCCButton.vue";
 
-export default {
-  name: 'TransferCardModal',
-  props: {
-    card: {
-      type: String,
-      default: ""
-    }
-  },
-  setup() {
-    const { transferCard } = useTx()
+const { transferCard } = useTx()
 
-    return { transferCard }
-  },
-  data() {
-    return {
-      recipient: "",
-      warningText: "",
-    }
+const emit = defineEmits(["close"]);
+
+const initialState: {
+  recipient: string;
+  validAddress: boolean;
+} = {
+  recipient: "",
+  validAddress: true,
+};
+
+const state = reactive(initialState);
+
+const props = withDefaults(
+  defineProps<{
+    card: number;
+  }>(),
+  {
+    card: () => -1,
   },
-  methods: {
-    close() {
-      this.$emit('close')
-    },
-    send() {
-      if (!validAddress(this.recipient)) {
-        this.warningText = "Input a proper address!"
-        return
-      }
-      this.warningText = ""
-      this.transferCard(this.card, this.recipient, _ => {
-        this.close()
-      }, () => {})
-    }
+);
+
+const transfer = () => {
+  if (validAddress(state.recipient)) {
+    state.validAddress = true
+    transferCard(props.card, 
+                state.recipient,
+                _ => {
+                  emit("close");
+                },
+                err => {
+                  console.error("Transfer failed: ", err)
+                });
+  }
+  else {
+    state.validAddress = false
   }
 }
 
-</script>
-
+</script>
\ No newline at end of file