diff --git a/components/AppModal.vue b/components/AppModal.vue
index f7ac5b72..03cc0249 100644
--- a/components/AppModal.vue
+++ b/components/AppModal.vue
@@ -71,10 +71,12 @@ onUnmounted(() => {
     :data-template="modal?.template"
     @on-backdrop-click="closeModal"
   >
-    <component
-      v-if="modalTemplateComponent"
-      :is="modalTemplateComponent"
-      class="animate-fade-in"
-    ></component>
+    <div class="max-h-[calc(100vh-100px)] overflow-y-auto">
+      <component
+        v-if="modalTemplateComponent"
+        :is="modalTemplateComponent"
+        class="animate-fade-in"
+      ></component>
+    </div>
   </lukso-modal>
 </template>
diff --git a/components/ProfileCard.vue b/components/ProfileCard.vue
index 9fa77d75..b6e13c9c 100644
--- a/components/ProfileCard.vue
+++ b/components/ProfileCard.vue
@@ -56,7 +56,7 @@ const hasFollowButton = computed(
       :background-url="profileBackground?.url"
       is-full-width
       shadow="small"
-      :border-radius="isMobile ? 'none' : 'medium'"
+      :border-radius="isMobile ? 'none' : 'small'"
       class="-mx-4 -mt-6 w-screen sm:mx-0 sm:mt-0 sm:w-full"
     >
       <div slot="header" class="relative flex size-full flex-col items-center">
diff --git a/components/__tests__/__snapshots__/ProfileCard.spec.ts.snap b/components/__tests__/__snapshots__/ProfileCard.spec.ts.snap
index ee82d56a..e0577c60 100644
--- a/components/__tests__/__snapshots__/ProfileCard.spec.ts.snap
+++ b/components/__tests__/__snapshots__/ProfileCard.spec.ts.snap
@@ -3,7 +3,7 @@
 exports[`ProfileCard > should render empty profile 1`] = `
 "<div id="test-wrapper">
   <div class="relative">
-    <lukso-card variant="dapp" is-full-width="" shadow="small" border-radius="medium" class="-mx-4 -mt-6 w-screen sm:mx-0 sm:mt-0 sm:w-full">
+    <lukso-card variant="dapp" is-full-width="" shadow="small" border-radius="small" class="-mx-4 -mt-6 w-screen sm:mx-0 sm:mt-0 sm:w-full">
       <div slot="header" class="relative flex size-full flex-col items-center">
         <div class="absolute right-4 top-4 flex flex-col items-end gap-2">
           <div>
@@ -61,7 +61,7 @@ exports[`ProfileCard > should render empty profile 1`] = `
 exports[`ProfileCard > should render followed by info 1`] = `
 "<div id="test-wrapper">
   <div class="relative">
-    <lukso-card variant="dapp" is-full-width="" shadow="small" border-radius="medium" class="-mx-4 -mt-6 w-screen sm:mx-0 sm:mt-0 sm:w-full">
+    <lukso-card variant="dapp" is-full-width="" shadow="small" border-radius="small" class="-mx-4 -mt-6 w-screen sm:mx-0 sm:mt-0 sm:w-full">
       <div slot="header" class="relative flex size-full flex-col items-center">
         <div class="absolute right-4 top-4 flex flex-col items-end gap-2">
           <div>
@@ -140,7 +140,7 @@ exports[`ProfileCard > should render followed by info 1`] = `
 exports[`ProfileCard > should render profile when connected 1`] = `
 "<div id="test-wrapper">
   <div class="relative">
-    <lukso-card variant="dapp" background-url="https://example.com/background.jpg" is-full-width="" shadow="small" border-radius="medium" class="-mx-4 -mt-6 w-screen sm:mx-0 sm:mt-0 sm:w-full">
+    <lukso-card variant="dapp" background-url="https://example.com/background.jpg" is-full-width="" shadow="small" border-radius="small" class="-mx-4 -mt-6 w-screen sm:mx-0 sm:mt-0 sm:w-full">
       <div slot="header" class="relative flex size-full flex-col items-center">
         <div class="absolute right-4 top-4 flex flex-col items-end gap-2">
           <div>
@@ -219,7 +219,7 @@ exports[`ProfileCard > should render profile when connected 1`] = `
 exports[`ProfileCard > should render profile when not connected 1`] = `
 "<div id="test-wrapper">
   <div class="relative">
-    <lukso-card variant="dapp" background-url="https://example.com/background.jpg" is-full-width="" shadow="small" border-radius="medium" class="-mx-4 -mt-6 w-screen sm:mx-0 sm:mt-0 sm:w-full">
+    <lukso-card variant="dapp" background-url="https://example.com/background.jpg" is-full-width="" shadow="small" border-radius="small" class="-mx-4 -mt-6 w-screen sm:mx-0 sm:mt-0 sm:w-full">
       <div slot="header" class="relative flex size-full flex-col items-center">
         <div class="absolute right-4 top-4 flex flex-col items-end gap-2">
           <div>
@@ -298,7 +298,7 @@ exports[`ProfileCard > should render profile when not connected 1`] = `
 exports[`ProfileCard > should render unfollow button 1`] = `
 "<div id="test-wrapper">
   <div class="relative">
-    <lukso-card variant="dapp" is-full-width="" shadow="small" border-radius="medium" class="-mx-4 -mt-6 w-screen sm:mx-0 sm:mt-0 sm:w-full">
+    <lukso-card variant="dapp" is-full-width="" shadow="small" border-radius="small" class="-mx-4 -mt-6 w-screen sm:mx-0 sm:mt-0 sm:w-full">
       <div slot="header" class="relative flex size-full flex-col items-center">
         <div class="absolute right-4 top-4 flex flex-col items-end gap-2">
           <div>
diff --git a/composables/web3-provider/useBaseProvider.ts b/composables/web3-provider/useBaseProvider.ts
index 4878c3f5..e6fba96e 100644
--- a/composables/web3-provider/useBaseProvider.ts
+++ b/composables/web3-provider/useBaseProvider.ts
@@ -17,6 +17,7 @@ const disconnect = () => {
   const { removeItem } = useLocalStorage()
   const { connectedProfileAddress, isWalletConnect, walletConnectProvider } =
     storeToRefs(useAppStore())
+  const { isEditingGrid } = storeToRefs(useGridStore())
 
   // disconnect WalletConnect
   if (isWalletConnect.value) {
@@ -24,8 +25,12 @@ const disconnect = () => {
     isWalletConnect.value = false
   }
 
+  // reset connected profile address
   connectedProfileAddress.value = undefined
+  // remove connection expiry
   removeItem(STORAGE_KEY.CONNECTION_EXPIRY)
+  // exit edit mode for grid
+  isEditingGrid.value = false
 }
 
 /**
diff --git a/domains/grid/components/AddWidgetSelection.vue b/domains/grid/components/AddWidgetSelection.vue
index b541e2ec..2198cb9a 100644
--- a/domains/grid/components/AddWidgetSelection.vue
+++ b/domains/grid/components/AddWidgetSelection.vue
@@ -41,181 +41,193 @@ const handleSelectWidget = (widgetType: GridWidgetType) => {
     </div>
   </div>
 
-  <!-- Custom section -->
-  <section
-    class="border-b border-b-neutral-90 px-6 py-4 last-of-type:border-b-0 last-of-type:pb-6"
-  >
-    <div class="paragraph-inter-16-semi-bold mb-4">
-      {{ formatMessage('add_widget_section_custom') }}
-    </div>
-    <div class="flex gap-5">
-      <!-- Iframe -->
-      <lukso-tooltip
-        variant="light"
-        :show-delay="SHOW_TOOLTIP_DELAY"
-        :text="formatMessage('widget_type_iframe')"
-      >
-        <div
-          class="flex size-10 cursor-pointer items-center justify-center rounded-full bg-neutral-20 transition hover:scale-[1.05]"
-          @click="handleSelectWidget('IFRAME')"
+  <div class="max-h-[calc(100vh-250px)] overflow-y-auto">
+    <!-- Website section -->
+    <section
+      class="border-b border-b-neutral-90 px-6 py-4 last-of-type:border-b-0 last-of-type:pb-6"
+    >
+      <div class="paragraph-inter-16-semi-bold mb-4">
+        {{ formatMessage('add_widget_section_website') }}
+      </div>
+      <div class="flex gap-5">
+        <!-- Iframe -->
+        <lukso-tooltip
+          variant="light"
+          :show-delay="SHOW_TOOLTIP_DELAY"
+          :text="formatMessage('widget_type_iframe')"
         >
-          <lukso-icon
-            name="code-outline"
-            size="medium"
-            color="neutral-100"
-          ></lukso-icon>
-        </div>
-      </lukso-tooltip>
+          <div
+            class="flex size-10 cursor-pointer items-center justify-center rounded-full bg-neutral-20 transition hover:scale-[1.05]"
+            @click="handleSelectWidget('IFRAME')"
+          >
+            <lukso-icon
+              name="code-outline"
+              size="medium"
+              color="neutral-100"
+            ></lukso-icon>
+          </div>
+        </lukso-tooltip>
+      </div>
+    </section>
 
-      <!-- Image -->
-      <lukso-tooltip
-        variant="light"
-        :show-delay="SHOW_TOOLTIP_DELAY"
-        :text="formatMessage('widget_type_image')"
-      >
-        <div
-          class="flex size-10 cursor-pointer items-center justify-center rounded-full bg-neutral-20 transition hover:scale-[1.05]"
-          @click="handleSelectWidget('IMAGE')"
+    <!-- Custom section -->
+    <section
+      class="border-b border-b-neutral-90 px-6 py-4 last-of-type:border-b-0 last-of-type:pb-6"
+    >
+      <div class="paragraph-inter-16-semi-bold mb-4">
+        {{ formatMessage('add_widget_section_custom') }}
+      </div>
+      <div class="flex gap-5">
+        <!-- Image -->
+        <lukso-tooltip
+          variant="light"
+          :show-delay="SHOW_TOOLTIP_DELAY"
+          :text="formatMessage('widget_type_image')"
         >
-          <lukso-icon
-            name="camera"
-            size="medium"
-            color="neutral-100"
-          ></lukso-icon>
-        </div>
-      </lukso-tooltip>
+          <div
+            class="flex size-10 cursor-pointer items-center justify-center rounded-full bg-neutral-20 transition hover:scale-[1.05]"
+            @click="handleSelectWidget('IMAGE')"
+          >
+            <lukso-icon
+              name="camera"
+              size="medium"
+              color="neutral-100"
+            ></lukso-icon>
+          </div>
+        </lukso-tooltip>
 
-      <!-- Text -->
-      <lukso-tooltip
-        variant="light"
-        :show-delay="SHOW_TOOLTIP_DELAY"
-        :text="formatMessage('widget_type_text')"
-      >
-        <div
-          class="flex size-10 cursor-pointer items-center justify-center rounded-full bg-neutral-20 transition hover:scale-[1.05]"
-          @click="handleSelectWidget('TEXT')"
+        <!-- Text -->
+        <lukso-tooltip
+          variant="light"
+          :show-delay="SHOW_TOOLTIP_DELAY"
+          :text="formatMessage('widget_type_text')"
         >
-          <lukso-icon
-            name="document-outline"
-            size="medium"
-            color="neutral-100"
-          ></lukso-icon>
-        </div>
-      </lukso-tooltip>
-    </div>
-  </section>
+          <div
+            class="flex size-10 cursor-pointer items-center justify-center rounded-full bg-neutral-20 transition hover:scale-[1.05]"
+            @click="handleSelectWidget('TEXT')"
+          >
+            <lukso-icon
+              name="document-outline"
+              size="medium"
+              color="neutral-100"
+            ></lukso-icon>
+          </div>
+        </lukso-tooltip>
+      </div>
+    </section>
 
-  <!-- Video section -->
-  <section
-    class="border-b border-b-neutral-90 px-6 py-4 last-of-type:border-b-0 last-of-type:pb-6"
-  >
-    <div class="paragraph-inter-16-semi-bold mb-4">
-      {{ formatMessage('add_widget_section_video') }}
-    </div>
-    <div class="flex gap-5">
-      <!-- Youtube -->
-      <lukso-tooltip
-        variant="light"
-        :show-delay="SHOW_TOOLTIP_DELAY"
-        :text="formatMessage('widget_type_youtube')"
-      >
-        <img
-          src="/images/social-media-youtube.svg"
-          alt="Youtube"
-          class="size-10 cursor-pointer transition hover:scale-[1.05]"
-          @click="handleSelectWidget('YOUTUBE')"
-        />
-      </lukso-tooltip>
-    </div>
-  </section>
+    <!-- Video section -->
+    <section
+      class="border-b border-b-neutral-90 px-6 py-4 last-of-type:border-b-0 last-of-type:pb-6"
+    >
+      <div class="paragraph-inter-16-semi-bold mb-4">
+        {{ formatMessage('add_widget_section_video') }}
+      </div>
+      <div class="flex gap-5">
+        <!-- Youtube -->
+        <lukso-tooltip
+          variant="light"
+          :show-delay="SHOW_TOOLTIP_DELAY"
+          :text="formatMessage('widget_type_youtube')"
+        >
+          <img
+            src="/images/social-media-youtube.svg"
+            alt="Youtube"
+            class="size-10 cursor-pointer transition hover:scale-[1.05]"
+            @click="handleSelectWidget('YOUTUBE')"
+          />
+        </lukso-tooltip>
+      </div>
+    </section>
 
-  <!-- Music section -->
-  <section
-    class="border-b border-b-neutral-90 px-6 py-4 last-of-type:border-b-0 last-of-type:pb-6"
-  >
-    <div class="paragraph-inter-16-semi-bold mb-4">
-      {{ formatMessage('add_widget_section_music') }}
-    </div>
-    <div class="flex gap-5">
-      <!-- Spotify -->
-      <lukso-tooltip
-        variant="light"
-        :show-delay="SHOW_TOOLTIP_DELAY"
-        :text="formatMessage('widget_type_spotify')"
-      >
-        <img
-          src="/images/social-media-spotify.svg"
-          alt="Spotify"
-          class="size-10 cursor-pointer transition hover:scale-[1.05]"
-          @click="handleSelectWidget('SPOTIFY')"
-        />
-      </lukso-tooltip>
+    <!-- Music section -->
+    <section
+      class="border-b border-b-neutral-90 px-6 py-4 last-of-type:border-b-0 last-of-type:pb-6"
+    >
+      <div class="paragraph-inter-16-semi-bold mb-4">
+        {{ formatMessage('add_widget_section_music') }}
+      </div>
+      <div class="flex gap-5">
+        <!-- Spotify -->
+        <lukso-tooltip
+          variant="light"
+          :show-delay="SHOW_TOOLTIP_DELAY"
+          :text="formatMessage('widget_type_spotify')"
+        >
+          <img
+            src="/images/social-media-spotify.svg"
+            alt="Spotify"
+            class="size-10 cursor-pointer transition hover:scale-[1.05]"
+            @click="handleSelectWidget('SPOTIFY')"
+          />
+        </lukso-tooltip>
 
-      <!-- Sound Cloud -->
-      <lukso-tooltip
-        variant="light"
-        :show-delay="SHOW_TOOLTIP_DELAY"
-        :text="formatMessage('widget_type_soundcloud')"
-      >
-        <img
-          src="/images/social-media-soundcloud.svg"
-          alt="Sound Cloud"
-          class="cursor-pointer transition hover:scale-[1.05]"
-          @click="handleSelectWidget('SOUNDCLOUD')"
-        />
-      </lukso-tooltip>
-    </div>
-  </section>
+        <!-- Sound Cloud -->
+        <lukso-tooltip
+          variant="light"
+          :show-delay="SHOW_TOOLTIP_DELAY"
+          :text="formatMessage('widget_type_soundcloud')"
+        >
+          <img
+            src="/images/social-media-soundcloud.svg"
+            alt="Sound Cloud"
+            class="cursor-pointer transition hover:scale-[1.05]"
+            @click="handleSelectWidget('SOUNDCLOUD')"
+          />
+        </lukso-tooltip>
+      </div>
+    </section>
 
-  <!-- Social section -->
-  <section
-    class="border-b border-b-neutral-90 px-6 py-4 last-of-type:border-b-0 last-of-type:pb-6"
-  >
-    <div class="paragraph-inter-16-semi-bold mb-4">
-      {{ formatMessage('add_widget_section_social') }}
-    </div>
-    <div class="flex gap-5">
-      <!-- X -->
-      <lukso-tooltip
-        variant="light"
-        :show-delay="SHOW_TOOLTIP_DELAY"
-        :text="formatMessage('widget_type_x')"
-      >
-        <img
-          src="/images/social-media-x.svg"
-          alt="X"
-          class="cursor-pointer transition hover:scale-[1.05]"
-          @click="handleSelectWidget('X')"
-        />
-      </lukso-tooltip>
+    <!-- Social section -->
+    <section
+      class="border-b border-b-neutral-90 px-6 py-4 last-of-type:border-b-0 last-of-type:pb-6"
+    >
+      <div class="paragraph-inter-16-semi-bold mb-4">
+        {{ formatMessage('add_widget_section_social') }}
+      </div>
+      <div class="flex gap-5">
+        <!-- X -->
+        <lukso-tooltip
+          variant="light"
+          :show-delay="SHOW_TOOLTIP_DELAY"
+          :text="formatMessage('widget_type_x')"
+        >
+          <img
+            src="/images/social-media-x.svg"
+            alt="X"
+            class="cursor-pointer transition hover:scale-[1.05]"
+            @click="handleSelectWidget('X')"
+          />
+        </lukso-tooltip>
 
-      <!-- Warpcast -->
-      <lukso-tooltip
-        variant="light"
-        :show-delay="SHOW_TOOLTIP_DELAY"
-        :text="formatMessage('widget_type_warpcast')"
-      >
-        <img
-          src="/images/social-media-warpcast.png"
-          alt="Warpcast"
-          class="size-10 cursor-pointer rounded-full transition hover:scale-[1.05]"
-          @click="handleSelectWidget('WARPCAST')"
-        />
-      </lukso-tooltip>
+        <!-- Warpcast -->
+        <lukso-tooltip
+          variant="light"
+          :show-delay="SHOW_TOOLTIP_DELAY"
+          :text="formatMessage('widget_type_warpcast')"
+        >
+          <img
+            src="/images/social-media-warpcast.png"
+            alt="Warpcast"
+            class="size-10 cursor-pointer rounded-full transition hover:scale-[1.05]"
+            @click="handleSelectWidget('WARPCAST')"
+          />
+        </lukso-tooltip>
 
-      <!-- Instagram -->
-      <lukso-tooltip
-        variant="light"
-        :show-delay="SHOW_TOOLTIP_DELAY"
-        :text="formatMessage('widget_type_instagram')"
-      >
-        <img
-          src="/images/social-media-instagram.svg"
-          alt="Warpcast"
-          class="size-10 cursor-pointer rounded-full transition hover:scale-[1.05]"
-          @click="handleSelectWidget('INSTAGRAM')"
-        />
-      </lukso-tooltip>
-    </div>
-  </section>
+        <!-- Instagram -->
+        <lukso-tooltip
+          variant="light"
+          :show-delay="SHOW_TOOLTIP_DELAY"
+          :text="formatMessage('widget_type_instagram')"
+        >
+          <img
+            src="/images/social-media-instagram.svg"
+            alt="Warpcast"
+            class="size-10 cursor-pointer rounded-full transition hover:scale-[1.05]"
+            @click="handleSelectWidget('INSTAGRAM')"
+          />
+        </lukso-tooltip>
+      </div>
+    </section>
+  </div>
 </template>
diff --git a/domains/grid/components/GridWidget.vue b/domains/grid/components/GridWidget.vue
index 91f4cbe5..bc42f854 100644
--- a/domains/grid/components/GridWidget.vue
+++ b/domains/grid/components/GridWidget.vue
@@ -166,9 +166,9 @@ onMounted(() => {
 <template>
   <div
     ref="target"
-    class="group relative flex h-full flex-col rounded-12"
+    class="group relative flex h-full flex-col rounded-12 transition"
     :class="{
-      'border border-neutral-90 bg-neutral-100 shadow-neutral-drop-shadow-1xl':
+      'bg-neutral-100 shadow-neutral-drop-shadow hover:shadow-neutral-drop-shadow-1xl':
         !isAddContentWidget,
       'select-none': isAllowToEdit,
       'z-50': isOpen,
diff --git a/translations/en_US.json b/translations/en_US.json
index 4a4491f4..95ebb15c 100644
--- a/translations/en_US.json
+++ b/translations/en_US.json
@@ -56,6 +56,7 @@
   "landing_hero_description_no_extension": "Looks like you don’t have the <span class=\"paragraph-inter-16-semi-bold\">Universal Profile browser extension</span> installed. You’ll need it before you can log in to our wallet service.",
   "asset_standard_badge_collection_contract": "LSP8 COLLECTION",
   "tooltip_text_copy_raw": "Copy raw",
+  "add_widget_section_website": "Website or Mini-App",
   "data_provider_graph_description": "Load data via the our Envio indexing service. This results in faster loading times and smoother UX, however inappropriate content might be removed.",
   "transak_success_message": "Please note that it can take some time for your balance to update.",
   "missing_asset_label_added": "Added",