diff --git a/admin-spa/src/components/EmailBuilder/EmailBuilder.tsx b/admin-spa/src/components/EmailBuilder/EmailBuilder.tsx
index 21e682e..050fdab 100644
--- a/admin-spa/src/components/EmailBuilder/EmailBuilder.tsx
+++ b/admin-spa/src/components/EmailBuilder/EmailBuilder.tsx
@@ -302,7 +302,7 @@ export function EmailBuilder({ blocks, onChange, variables = [] }: EmailBuilderP
             </DialogDescription>
           </DialogHeader>
 
-          <div className="space-y-4 py-4">
+          <div className="space-y-4 px-6 py-4">
             {editingBlock?.type === 'card' && (
               <>
                 <div className="space-y-2">
diff --git a/admin-spa/src/components/ui/rich-text-editor.tsx b/admin-spa/src/components/ui/rich-text-editor.tsx
index e3571c8..b3af934 100644
--- a/admin-spa/src/components/ui/rich-text-editor.tsx
+++ b/admin-spa/src/components/ui/rich-text-editor.tsx
@@ -391,7 +391,7 @@ export function RichTextEditor({
           </DialogHeader>
 
           <DialogBody>
-            <div className="space-y-4">
+            <div className="space-y-4 !p-4">
               <div className="space-y-2">
                 <Label htmlFor="btn-text">{__('Button Text')}</Label>
                 <Input
diff --git a/admin-spa/src/components/ui/select.tsx b/admin-spa/src/components/ui/select.tsx
index edb9c90..c6ed062 100644
--- a/admin-spa/src/components/ui/select.tsx
+++ b/admin-spa/src/components/ui/select.tsx
@@ -69,33 +69,49 @@ SelectScrollDownButton.displayName =
 const SelectContent = React.forwardRef<
   React.ElementRef<typeof SelectPrimitive.Content>,
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
->(({ className, children, position = "popper", ...props }, ref) => (
-  <SelectPrimitive.Portal>
-    <SelectPrimitive.Content
-      ref={ref}
-      className={cn(
-        "relative z-50 max-h-[--radix-select-content-available-height] min-w-[8rem] overflow-y-auto overflow-x-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-select-content-transform-origin]",
-        position === "popper" &&
-          "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
-        className
-      )}
-      position={position}
-      {...props}
-    >
-      <SelectScrollUpButton />
-      <SelectPrimitive.Viewport
+>(({ className, children, position = "popper", ...props }, ref) => {
+  // Get or create portal container inside the app for proper CSS scoping
+  const getPortalContainer = () => {
+    const appContainer = document.getElementById('woonoow-admin-app');
+    if (!appContainer) return document.body;
+
+    let portalRoot = document.getElementById('woonoow-select-portal');
+    if (!portalRoot) {
+      portalRoot = document.createElement('div');
+      portalRoot.id = 'woonoow-select-portal';
+      appContainer.appendChild(portalRoot);
+    }
+    return portalRoot;
+  };
+
+  return (
+    <SelectPrimitive.Portal container={getPortalContainer()}>
+      <SelectPrimitive.Content
+        ref={ref}
         className={cn(
-          "p-1",
+          "relative z-50 max-h-[--radix-select-content-available-height] min-w-[8rem] overflow-y-auto overflow-x-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-select-content-transform-origin]",
           position === "popper" &&
-            "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]"
+          "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+          className
         )}
+        position={position}
+        {...props}
       >
-        {children}
-      </SelectPrimitive.Viewport>
-      <SelectScrollDownButton />
-    </SelectPrimitive.Content>
-  </SelectPrimitive.Portal>
-))
+        <SelectScrollUpButton />
+        <SelectPrimitive.Viewport
+          className={cn(
+            "p-1",
+            position === "popper" &&
+            "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]"
+          )}
+        >
+          {children}
+        </SelectPrimitive.Viewport>
+        <SelectScrollDownButton />
+      </SelectPrimitive.Content>
+    </SelectPrimitive.Portal>
+  );
+})
 SelectContent.displayName = SelectPrimitive.Content.displayName
 
 const SelectLabel = React.forwardRef<
diff --git a/includes/Core/Notifications/EmailRenderer.php b/includes/Core/Notifications/EmailRenderer.php
index ac4c7e0..4b6b410 100644
--- a/includes/Core/Notifications/EmailRenderer.php
+++ b/includes/Core/Notifications/EmailRenderer.php
@@ -140,9 +140,12 @@ class EmailRenderer {
 	 */
 	private function get_variables($event_id, $data, $extra_data = []) {
 		$variables = [
+			'site_name' => get_bloginfo('name'),
+			'site_title' => get_bloginfo('name'),
 			'store_name' => get_bloginfo('name'),
 			'store_url' => home_url(),
-			'site_title' => get_bloginfo('name'),
+			'shop_url' => get_permalink(wc_get_page_id('shop')),
+			'my_account_url' => get_permalink(wc_get_page_id('myaccount')),
 			'support_email' => get_option('admin_email'),
 			'current_year' => date('Y'),
 		];
@@ -611,8 +614,13 @@ class EmailRenderer {
 	 * @return string
 	 */
 	private function get_social_icon_url($platform, $color = 'white') {
-		// Use local PNG icons
-		$plugin_url = plugin_dir_url(dirname(dirname(dirname(__FILE__))));
+		// Use plugin URL constant if available, otherwise calculate from file path
+		if (defined('WOONOOW_URL')) {
+			$plugin_url = WOONOOW_URL;
+		} else {
+			// File is at includes/Core/Notifications/EmailRenderer.php - need 4 levels up
+			$plugin_url = plugin_dir_url(dirname(dirname(dirname(dirname(__FILE__)))));
+		}
 		$filename = sprintf('mage--%s-%s.png', $platform, $color);
 		return $plugin_url . 'assets/icons/' . $filename;
 	}