diff --git a/modules/ui.py b/modules/ui.py
index 2d3ade4..dc497df 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -28,27 +28,27 @@ from modules.utilities import (
 ROOT = None
 POPUP = None
 POPUP_LIVE = None
-ROOT_HEIGHT = 700
-ROOT_WIDTH = 600
+ROOT_HEIGHT = 800
+ROOT_WIDTH = 1000
 
 PREVIEW = None
-PREVIEW_MAX_HEIGHT = 700
-PREVIEW_MAX_WIDTH = 1200
-PREVIEW_DEFAULT_WIDTH = 960
-PREVIEW_DEFAULT_HEIGHT = 540
+PREVIEW_MAX_HEIGHT = 800
+PREVIEW_MAX_WIDTH = 1400
+PREVIEW_DEFAULT_WIDTH = 1280
+PREVIEW_DEFAULT_HEIGHT = 720
 
-POPUP_WIDTH = 750
-POPUP_HEIGHT = 810
-POPUP_SCROLL_WIDTH = 740
-POPUP_SCROLL_HEIGHT = 700
+POPUP_WIDTH = 700
+POPUP_HEIGHT = 800
+POPUP_SCROLL_WIDTH = 680
+POPUP_SCROLL_HEIGHT = 600
 
-POPUP_LIVE_WIDTH = 900
-POPUP_LIVE_HEIGHT = 820
-POPUP_LIVE_SCROLL_WIDTH = 890
-POPUP_LIVE_SCROLL_HEIGHT = 700
+POPUP_LIVE_WIDTH = 850
+POPUP_LIVE_HEIGHT = 700
+POPUP_LIVE_SCROLL_WIDTH = 830
+POPUP_LIVE_SCROLL_HEIGHT = 600
 
-MAPPER_PREVIEW_MAX_HEIGHT = 100
-MAPPER_PREVIEW_MAX_WIDTH = 100
+MAPPER_PREVIEW_MAX_HEIGHT = 120
+MAPPER_PREVIEW_MAX_WIDTH = 120
 
 DEFAULT_BUTTON_WIDTH = 200
 DEFAULT_BUTTON_HEIGHT = 40
@@ -71,7 +71,21 @@ target_label_dict_live = {}
 img_ft, vid_ft = modules.globals.file_types
 
 
-class DragDropButton(ctk.CTkButton):
+class ModernButton(ctk.CTkButton):
+    def __init__(self, master, **kwargs):
+        super().__init__(master, **kwargs)
+        self.configure(
+            font=("Roboto", 16, "bold"),
+            corner_radius=15,
+            border_width=2,
+            border_color="#3a7ebf",
+            hover_color="#2b5d8b",
+            fg_color="#3a7ebf",
+            text_color="white",
+        )
+
+
+class DragDropButton(ModernButton):
     def __init__(self, master, **kwargs):
         super().__init__(master, **kwargs)
         self.drop_target_register(tkdnd.DND_FILES)
@@ -93,7 +107,7 @@ class SourceButton(DragDropButton):
             modules.globals.source_path = file_path
             global RECENT_DIRECTORY_SOURCE
             RECENT_DIRECTORY_SOURCE = os.path.dirname(modules.globals.source_path)
-            image = render_image_preview(modules.globals.source_path, (200, 200))
+            image = render_image_preview(modules.globals.source_path, (250, 250))
             source_label.configure(image=image)
             source_label.configure(text="")
 
@@ -106,7 +120,9 @@ class SourceMapperButton(DragDropButton):
 
     def handle_drop(self, file_path):
         if is_image(file_path):
-            update_popup_source(self.master, self.map, self.button_num, file_path)
+            update_popup_source(
+                self.master.master, self.map, self.button_num, file_path
+            )
 
 
 class TargetButton(DragDropButton):
@@ -116,16 +132,27 @@ class TargetButton(DragDropButton):
             modules.globals.target_path = file_path
             RECENT_DIRECTORY_TARGET = os.path.dirname(modules.globals.target_path)
             if is_image(file_path):
-                image = render_image_preview(modules.globals.target_path, (200, 200))
+                image = render_image_preview(modules.globals.target_path, (250, 250))
                 target_label.configure(image=image)
                 target_label.configure(text="")
             elif is_video(file_path):
-                video_frame = render_video_preview(file_path, (200, 200))
+                video_frame = render_video_preview(file_path, (250, 250))
                 target_label.configure(image=video_frame)
                 target_label.configure(text="")
 
 
-class DragDropLabel(ctk.CTkLabel):
+class ModernLabel(ctk.CTkLabel):
+    def __init__(self, master, **kwargs):
+        super().__init__(master, **kwargs)
+        self.configure(
+            font=("Roboto", 16),
+            corner_radius=10,
+            fg_color="#2a2d2e",
+            text_color="white",
+        )
+
+
+class DragDropLabel(ModernLabel):
     def __init__(self, master, **kwargs):
         super().__init__(master, **kwargs)
         self.drop_target_register(tkdnd.DND_FILES)
@@ -147,7 +174,7 @@ class SourceLabel(DragDropLabel):
             modules.globals.source_path = file_path
             global RECENT_DIRECTORY_SOURCE
             RECENT_DIRECTORY_SOURCE = os.path.dirname(modules.globals.source_path)
-            image = render_image_preview(modules.globals.source_path, (200, 200))
+            image = render_image_preview(modules.globals.source_path, (250, 250))
             source_label.configure(image=image)
             source_label.configure(text="")
 
@@ -159,11 +186,11 @@ class TargetLabel(DragDropLabel):
             modules.globals.target_path = file_path
             RECENT_DIRECTORY_TARGET = os.path.dirname(modules.globals.target_path)
             if is_image(file_path):
-                image = render_image_preview(modules.globals.target_path, (200, 200))
+                image = render_image_preview(modules.globals.target_path, (250, 250))
                 target_label.configure(image=image)
                 target_label.configure(text="")
             elif is_video(file_path):
-                video_frame = render_video_preview(file_path, (200, 200))
+                video_frame = render_video_preview(file_path, (250, 250))
                 target_label.configure(image=video_frame)
                 target_label.configure(text="")
 
@@ -183,221 +210,256 @@ def create_root(
     global source_label, target_label, status_label
 
     ctk.set_appearance_mode("dark")
-    ctk.set_default_color_theme("blue")  # Use a built-in theme
+    ctk.set_default_color_theme("blue")
 
     root = tkdnd.TkinterDnD.Tk()
-    root.minsize(ROOT_WIDTH, ROOT_HEIGHT)
     root.title(
         f"{modules.metadata.name} {modules.metadata.version} {modules.metadata.edition}"
     )
-    root.configure(bg="gray12")
+    root.configure(bg="#1a1a1a")
     root.protocol("WM_DELETE_WINDOW", lambda: destroy())
+    root.resizable(True, True)
+
+    main_frame = ctk.CTkFrame(root, fg_color="#1a1a1a")
+    main_frame.pack(fill="both", expand=True, padx=20, pady=20)
+
+    # Create two vertical frames for source and target
+    source_frame = ctk.CTkFrame(main_frame, fg_color="#2a2d2e", corner_radius=15)
+    source_frame.grid(row=0, column=0, padx=10, pady=10, sticky="nsew")
+
+    target_frame = ctk.CTkFrame(main_frame, fg_color="#2a2d2e", corner_radius=15)
+    target_frame.grid(row=0, column=2, padx=10, pady=10, sticky="nsew")
+
+    # Create a middle frame for swap button
+    middle_frame = ctk.CTkFrame(main_frame, fg_color="#1a1a1a")
+    middle_frame.grid(row=0, column=1, padx=5, pady=10, sticky="ns")
 
     source_label = SourceLabel(
-        root,
+        source_frame,
         text="Drag & Drop\nSource Image Here",
-        text_color="gray",
-        font=("Arial", 16),
         justify="center",
+        width=250,
+        height=250,
     )
-    source_label.place(relx=0.1, rely=0.1, relwidth=0.3, relheight=0.25)
+    source_label.pack(pady=(20, 10))
 
     target_label = TargetLabel(
-        root,
+        target_frame,
         text="Drag & Drop\nTarget Image/Video Here",
-        text_color="gray",
-        font=("Arial", 16),
         justify="center",
+        width=250,
+        height=250,
     )
-    target_label.place(relx=0.6, rely=0.1, relwidth=0.3, relheight=0.25)
+    target_label.pack(pady=(20, 10))
 
     select_face_button = SourceButton(
-        root,
+        source_frame,
         text="Select a face",
         cursor="hand2",
         command=lambda: select_source_path(),
-        fg_color=("gray75", "gray25"),  # Modern button color
-        hover_color=("gray85", "gray35"),
-        corner_radius=10,  # Rounded corners
     )
-    select_face_button.place(relx=0.1, rely=0.4, relwidth=0.3, relheight=0.1)
-
-    swap_faces_button = ctk.CTkButton(
-        root,
-        text="↔",
-        cursor="hand2",
-        command=lambda: swap_faces_paths(),
-        fg_color=("gray75", "gray25"),
-        hover_color=("gray85", "gray35"),
-        corner_radius=10,
-    )
-    swap_faces_button.place(relx=0.45, rely=0.4, relwidth=0.1, relheight=0.1)
+    select_face_button.pack(pady=10)
 
     select_target_button = TargetButton(
-        root,
+        target_frame,
         text="Select a target",
         cursor="hand2",
         command=lambda: select_target_path(),
-        fg_color=("gray75", "gray25"),
-        hover_color=("gray85", "gray35"),
-        corner_radius=10,
     )
-    select_target_button.place(relx=0.6, rely=0.4, relwidth=0.3, relheight=0.1)
+    select_target_button.pack(pady=10)
 
+    swap_faces_button = ModernButton(
+        middle_frame,
+        text="↔",
+        cursor="hand2",
+        command=lambda: swap_faces_paths(),
+        width=50,
+        height=50,
+    )
+    swap_faces_button.pack(expand=True)
+
+    options_frame = ctk.CTkFrame(main_frame, fg_color="#2a2d2e", corner_radius=15)
+    options_frame.grid(row=1, column=0, columnspan=3, padx=10, pady=10, sticky="nsew")
+
+    # Create a single column for options, centered
+    options_column = ctk.CTkFrame(options_frame, fg_color="#2a2d2e")
+    options_column.pack(expand=True)
+
+    # Switches
     keep_fps_value = ctk.BooleanVar(value=modules.globals.keep_fps)
     keep_fps_checkbox = ctk.CTkSwitch(
-        root,
+        options_column,
         text="Keep fps",
         variable=keep_fps_value,
         cursor="hand2",
         command=lambda: setattr(
             modules.globals, "keep_fps", not modules.globals.keep_fps
         ),
-        fg_color=("gray75", "gray25"),  # Modern switch color
-        progress_color=("DodgerBlue", "DodgerBlue"),
+        progress_color="#3a7ebf",
+        font=("Roboto", 14, "bold"),
     )
-    keep_fps_checkbox.place(relx=0.1, rely=0.6)
+    keep_fps_checkbox.pack(pady=5, anchor="w")
 
     keep_frames_value = ctk.BooleanVar(value=modules.globals.keep_frames)
     keep_frames_switch = ctk.CTkSwitch(
-        root,
+        options_column,
         text="Keep frames",
         variable=keep_frames_value,
         cursor="hand2",
         command=lambda: setattr(
             modules.globals, "keep_frames", keep_frames_value.get()
         ),
-        fg_color=("gray75", "gray25"),
-        progress_color=("DodgerBlue", "DodgerBlue"),
+        progress_color="#3a7ebf",
+        font=("Roboto", 14, "bold"),
     )
-    keep_frames_switch.place(relx=0.1, rely=0.65)
+    keep_frames_switch.pack(pady=5, anchor="w")
 
     enhancer_value = ctk.BooleanVar(value=modules.globals.fp_ui["face_enhancer"])
     enhancer_switch = ctk.CTkSwitch(
-        root,
+        options_column,
         text="Face Enhancer",
         variable=enhancer_value,
         cursor="hand2",
         command=lambda: update_tumbler("face_enhancer", enhancer_value.get()),
-        fg_color=("gray75", "gray25"),
-        progress_color=("DodgerBlue", "DodgerBlue"),
+        progress_color="#3a7ebf",
+        font=("Roboto", 14, "bold"),
     )
-    enhancer_switch.place(relx=0.1, rely=0.7)
+    enhancer_switch.pack(pady=5, anchor="w")
 
     keep_audio_value = ctk.BooleanVar(value=modules.globals.keep_audio)
     keep_audio_switch = ctk.CTkSwitch(
-        root,
+        options_column,
         text="Keep audio",
         variable=keep_audio_value,
         cursor="hand2",
         command=lambda: setattr(modules.globals, "keep_audio", keep_audio_value.get()),
-        fg_color=("gray75", "gray25"),
-        progress_color=("DodgerBlue", "DodgerBlue"),
+        progress_color="#3a7ebf",
+        font=("Roboto", 14, "bold"),
     )
-    keep_audio_switch.place(relx=0.6, rely=0.6)
+    keep_audio_switch.pack(pady=5, anchor="w")
 
     many_faces_value = ctk.BooleanVar(value=modules.globals.many_faces)
     many_faces_switch = ctk.CTkSwitch(
-        root,
+        options_column,
         text="Many faces",
         variable=many_faces_value,
         cursor="hand2",
         command=lambda: setattr(modules.globals, "many_faces", many_faces_value.get()),
-        fg_color=("gray75", "gray25"),
-        progress_color=("DodgerBlue", "DodgerBlue"),
+        progress_color="#3a7ebf",
+        font=("Roboto", 14, "bold"),
     )
-    many_faces_switch.place(relx=0.6, rely=0.65)
+    many_faces_switch.pack(pady=5, anchor="w")
 
     color_correction_value = ctk.BooleanVar(value=modules.globals.color_correction)
     color_correction_switch = ctk.CTkSwitch(
-        root,
-        text="Fix Blueish Cam -\nforce cv2 to\nuse RGB instead of BGR",
+        options_column,
+        text="Fix Blueish Cam",
         variable=color_correction_value,
         cursor="hand2",
         command=lambda: setattr(
             modules.globals, "color_correction", color_correction_value.get()
         ),
-        fg_color=("gray75", "gray25"),
-        progress_color=("DodgerBlue", "DodgerBlue"),
+        progress_color="#3a7ebf",
+        font=("Roboto", 14, "bold"),
     )
-    color_correction_switch.place(relx=0.6, rely=0.70)
+    color_correction_switch.pack(pady=5, anchor="w")
 
     map_faces = ctk.BooleanVar(value=modules.globals.map_faces)
     map_faces_switch = ctk.CTkSwitch(
-        root,
+        options_column,
         text="Map faces",
         variable=map_faces,
         cursor="hand2",
         command=lambda: setattr(modules.globals, "map_faces", map_faces.get()),
-        fg_color=("gray75", "gray25"),
-        progress_color=("DodgerBlue", "DodgerBlue"),
+        progress_color="#3a7ebf",
+        font=("Roboto", 14, "bold"),
     )
-    map_faces_switch.place(relx=0.1, rely=0.75)
+    map_faces_switch.pack(pady=5, anchor="w")
 
-    start_button = ctk.CTkButton(
-        root,
+    button_frame = ctk.CTkFrame(main_frame, fg_color="#1a1a1a")
+    button_frame.grid(row=2, column=0, columnspan=3, padx=10, pady=10, sticky="nsew")
+
+    start_button = ModernButton(
+        button_frame,
         text="Start",
         cursor="hand2",
         command=lambda: analyze_target(start, root),
-        fg_color=("DodgerBlue", "DodgerBlue"),  # Modern button color
-        hover_color=("RoyalBlue", "RoyalBlue"),
-        corner_radius=10,
+        fg_color="#4CAF50",
+        hover_color="#45a049",
     )
-    start_button.place(relx=0.15, rely=0.80, relwidth=0.2, relheight=0.05)
+    start_button.pack(side="left", padx=10, expand=True)
 
-    stop_button = ctk.CTkButton(
-        root,
-        text="Destroy",
-        cursor="hand2",
-        command=lambda: destroy(),
-        fg_color=("gray75", "gray25"),
-        hover_color=("gray85", "gray35"),
-        corner_radius=10,
-    )
-    stop_button.place(relx=0.4, rely=0.80, relwidth=0.2, relheight=0.05)
-
-    preview_button = ctk.CTkButton(
-        root,
+    preview_button = ModernButton(
+        button_frame,
         text="Preview",
         cursor="hand2",
         command=lambda: toggle_preview(),
-        fg_color=("gray75", "gray25"),
-        hover_color=("gray85", "gray35"),
-        corner_radius=10,
     )
-    preview_button.place(relx=0.65, rely=0.80, relwidth=0.2, relheight=0.05)
+    preview_button.pack(side="left", padx=10, expand=True)
 
-    live_button = ctk.CTkButton(
-        root,
+    live_button = ModernButton(
+        button_frame,
         text="Live",
         cursor="hand2",
         command=lambda: webcam_preview(root),
-        fg_color=("gray75", "gray25"),
-        hover_color=("gray85", "gray35"),
-        corner_radius=10,
     )
-    live_button.place(relx=0.40, rely=0.86, relwidth=0.2, relheight=0.05)
+    live_button.pack(side="left", padx=10, expand=True)
 
-    status_label = ctk.CTkLabel(root, text=None, justify="center")
-    status_label.place(relx=0.1, rely=0.9, relwidth=0.8)
-
-    donate_label = ctk.CTkLabel(
-        root, text="Deep Live Cam", justify="center", cursor="hand2"
+    stop_button = ModernButton(
+        button_frame,
+        text="Destroy",
+        cursor="hand2",
+        command=lambda: destroy(),
+        fg_color="#f44336",
+        hover_color="#d32f2f",
     )
-    donate_label.place(relx=0.1, rely=0.95, relwidth=0.8)
+    stop_button.pack(side="left", padx=10, expand=True)
 
-    # Access the URL text color directly
-    donate_label.configure(text_color="dodger blue")
+    status_label = ModernLabel(
+        main_frame, text=None, justify="center", fg_color="#1a1a1a"
+    )
+    status_label.grid(row=3, column=0, columnspan=3, pady=10, sticky="ew")
+
+    donate_frame = ctk.CTkFrame(main_frame, fg_color="#1a1a1a")
+    donate_frame.grid(row=4, column=0, columnspan=3, pady=5, sticky="ew")
+
+    donate_label = ModernLabel(
+        donate_frame,
+        text="Donate",
+        justify="center",
+        cursor="hand2",
+        fg_color="#1870c4",
+        text_color="#1870c4",
+    )
+    donate_label.pack(side="left", expand=True)
 
     donate_label.bind(
         "<Button>", lambda event: webbrowser.open("https://paypal.me/hacksider")
     )
 
+    remove_donate_button = ModernButton(
+        donate_frame,
+        text="X",
+        cursor="hand2",
+        command=lambda: donate_frame.destroy(),
+        width=30,
+        height=30,
+        fg_color="#f44336",
+        hover_color="#d32f2f",
+    )
+    remove_donate_button.pack(side="right", padx=(10, 0))
+
+    main_frame.grid_columnconfigure((0, 2), weight=1)
+    main_frame.grid_rowconfigure((0, 1, 2), weight=1)
+
+    root.grid_columnconfigure(0, weight=1)
+    root.grid_rowconfigure(0, weight=1)
+
     return root
 
 
 def analyze_target(start: Callable[[], None], root: ctk.CTk):
-    if POPUP != None and POPUP.winfo_exists():
+    if POPUP is not None and POPUP.winfo_exists():
         update_status("Please complete pop-up or close it.")
         return
 
@@ -410,6 +472,9 @@ def analyze_target(start: Callable[[], None], root: ctk.CTk):
         elif is_video(modules.globals.target_path):
             update_status("Getting unique faces")
             get_unique_faces_from_target_video()
+        else:
+            update_status("Invalid target file. Please select an image or video.")
+            return
 
         if len(modules.globals.souce_target_map) > 0:
             create_source_target_popup(start, root, modules.globals.souce_target_map)
@@ -428,27 +493,35 @@ def create_source_target_popup(
     POPUP.title("Source x Target Mapper")
     POPUP.geometry(f"{POPUP_WIDTH}x{POPUP_HEIGHT}")
     POPUP.focus()
+    POPUP.resizable(True, True)
 
     def on_submit_click(start):
         if has_valid_map():
             POPUP.destroy()
             select_output_path(start)
         else:
-            update_pop_status("Atleast 1 source with target is required!")
+            update_pop_status("At least 1 source with target is required!")
 
     scrollable_frame = ctk.CTkScrollableFrame(
         POPUP, width=POPUP_SCROLL_WIDTH, height=POPUP_SCROLL_HEIGHT
     )
-    scrollable_frame.grid(row=0, column=0, padx=0, pady=0, sticky="nsew")
+    scrollable_frame.pack(fill="both", expand=True, padx=10, pady=10)
 
     def on_button_click(map, button_num):
         update_popup_source(scrollable_frame, map, button_num)
 
+    # Create a frame to hold the table
+    table_frame = ctk.CTkFrame(scrollable_frame)
+    table_frame.pack(expand=True)
+
     for item in map:
         id = item["id"]
 
-        button = SourceMapperButton(
-            scrollable_frame,
+        row_frame = ctk.CTkFrame(table_frame)
+        row_frame.pack(fill="x", pady=5)
+
+        source_button = SourceMapperButton(
+            row_frame,
             map,
             id,
             text="Select source image",
@@ -459,15 +532,24 @@ def create_source_target_popup(
             hover_color=("gray85", "gray35"),
             corner_radius=10,
         )
-        button.grid(row=id, column=0, padx=50, pady=10)
+        source_button.pack(side="left", padx=(0, 10))
 
-        x_label = ctk.CTkLabel(
-            scrollable_frame,
-            text=f"X",
+        source_image = ctk.CTkLabel(
+            row_frame,
+            text=f"S-{id}",
             width=MAPPER_PREVIEW_MAX_WIDTH,
             height=MAPPER_PREVIEW_MAX_HEIGHT,
+            font=("Arial", 14, "bold"),
         )
-        x_label.grid(row=id, column=2, padx=10, pady=10)
+        source_image.pack(side="left", padx=(0, 10))
+
+        x_label = ctk.CTkLabel(
+            row_frame,
+            text=f"X",
+            width=30,
+            font=("Arial", 14, "bold"),
+        )
+        x_label.pack(side="left", padx=(0, 10))
 
         image = Image.fromarray(cv2.cvtColor(item["target"]["cv2"], cv2.COLOR_BGR2RGB))
         image = image.resize(
@@ -476,26 +558,35 @@ def create_source_target_popup(
         tk_image = ctk.CTkImage(image, size=image.size)
 
         target_image = ctk.CTkLabel(
-            scrollable_frame,
+            row_frame,
             text=f"T-{id}",
             width=MAPPER_PREVIEW_MAX_WIDTH,
             height=MAPPER_PREVIEW_MAX_HEIGHT,
+            font=("Arial", 14, "bold"),
         )
-        target_image.grid(row=id, column=3, padx=10, pady=10)
+        target_image.pack(side="left")
         target_image.configure(image=tk_image)
 
-    popup_status_label = ctk.CTkLabel(POPUP, text=None, justify="center")
-    popup_status_label.grid(row=1, column=0, pady=15)
+    popup_status_label = ctk.CTkLabel(
+        POPUP, text=None, justify="center", font=("Arial", 14, "bold")
+    )
+    popup_status_label.pack(pady=10)
 
-    close_button = ctk.CTkButton(
+    submit_button = ctk.CTkButton(
         POPUP,
         text="Submit",
         command=lambda: on_submit_click(start),
         fg_color=("DodgerBlue", "DodgerBlue"),
         hover_color=("RoyalBlue", "RoyalBlue"),
         corner_radius=10,
+        font=("Arial", 16, "bold"),
+        width=200,
+        height=50,
     )
-    close_button.grid(row=2, column=0, pady=10)
+    submit_button.pack(pady=10)
+
+    POPUP.update()
+    POPUP.minsize(POPUP.winfo_width(), POPUP.winfo_height())
 
 
 def update_popup_source(
@@ -515,8 +606,9 @@ def update_popup_source(
 
     if "source" in map[button_num]:
         map[button_num].pop("source")
-        source_label_dict[button_num].destroy()
-        del source_label_dict[button_num]
+        if button_num in source_label_dict:
+            source_label_dict[button_num].destroy()
+            del source_label_dict[button_num]
 
     if source_path == "":
         return map
@@ -542,12 +634,17 @@ def update_popup_source(
             tk_image = ctk.CTkImage(image, size=image.size)
 
             source_image = ctk.CTkLabel(
-                scrollable_frame,
+                scrollable_frame.winfo_children()[button_num],
                 text=f"S-{button_num}",
                 width=MAPPER_PREVIEW_MAX_WIDTH,
                 height=MAPPER_PREVIEW_MAX_HEIGHT,
+                font=("Arial", 14, "bold"),
+            )
+            source_image.pack(
+                side="left",
+                padx=(0, 10),
+                after=scrollable_frame.winfo_children()[button_num].winfo_children()[0],
             )
-            source_image.grid(row=button_num, column=1, padx=10, pady=10)
             source_image.configure(image=tk_image)
             source_label_dict[button_num] = source_image
         else:
@@ -565,19 +662,20 @@ def create_preview(parent: ctk.CTkToplevel) -> ctk.CTkToplevel:
     preview.protocol("WM_DELETE_WINDOW", lambda: toggle_preview())
     preview.resizable(width=True, height=True)
 
-    preview_label = ctk.CTkLabel(preview, text=None)
+    preview_label = ctk.CTkLabel(preview, text=None, font=("Arial", 14, "bold"))
     preview_label.pack(fill="both", expand=True)
 
     preview_slider = ctk.CTkSlider(
         preview,
         from_=0,
         to=0,
-        command=lambda frame_value: update_preview(frame_value),
+        command=lambda frame_value: update_preview(int(frame_value)),
         fg_color=("gray75", "gray25"),
         progress_color=("DodgerBlue", "DodgerBlue"),
         button_color=("DodgerBlue", "DodgerBlue"),
         button_hover_color=("RoyalBlue", "RoyalBlue"),
     )
+    preview_slider.pack(fill="x", padx=20, pady=10)
 
     return preview
 
@@ -895,7 +993,7 @@ def create_source_target_popup_for_webcam(root: ctk.CTk, map: list) -> None:
             simplify_maps()
             create_webcam_preview()
         else:
-            update_pop_live_status("Atleast 1 source with target is required!")
+            update_pop_live_status("At least 1 source with target is required!")
 
     def on_add_click():
         add_blank_map()
@@ -950,8 +1048,13 @@ def refresh_data(map: list):
     for item in map:
         id = item["id"]
 
-        button = ctk.CTkButton(
-            scrollable_frame,
+        row_frame = ctk.CTkFrame(scrollable_frame)
+        row_frame.pack(fill="x", pady=5)
+
+        source_button = SourceMapperButton(  # Use SourceMapperButton here
+            row_frame,
+            map,
+            id,
             text="Select source image",
             command=lambda id=id: on_sbutton_click(map, id),
             width=DEFAULT_BUTTON_WIDTH,
@@ -960,27 +1063,15 @@ def refresh_data(map: list):
             hover_color=("gray85", "gray35"),
             corner_radius=10,
         )
-        button.grid(row=id, column=0, padx=30, pady=10)
+        source_button.pack(side="left", padx=(0, 10))
 
-        x_label = ctk.CTkLabel(
-            scrollable_frame,
-            text=f"X",
+        source_image_label = ctk.CTkLabel(  # Create a label for source image
+            row_frame,
+            text=f"S-{id}",
             width=MAPPER_PREVIEW_MAX_WIDTH,
             height=MAPPER_PREVIEW_MAX_HEIGHT,
         )
-        x_label.grid(row=id, column=2, padx=10, pady=10)
-
-        button = ctk.CTkButton(
-            scrollable_frame,
-            text="Select target image",
-            command=lambda id=id: on_tbutton_click(map, id),
-            width=DEFAULT_BUTTON_WIDTH,
-            height=DEFAULT_BUTTON_HEIGHT,
-            fg_color=("gray75", "gray25"),
-            hover_color=("gray85", "gray35"),
-            corner_radius=10,
-        )
-        button.grid(row=id, column=3, padx=20, pady=10)
+        source_image_label.pack(side="left", padx=(0, 10))
 
         if "source" in item:
             image = Image.fromarray(
@@ -990,15 +1081,38 @@ def refresh_data(map: list):
                 (MAPPER_PREVIEW_MAX_WIDTH, MAPPER_PREVIEW_MAX_HEIGHT), Image.LANCZOS
             )
             tk_image = ctk.CTkImage(image, size=image.size)
+            source_image_label.configure(image=tk_image)
 
-            source_image = ctk.CTkLabel(
-                scrollable_frame,
-                text=f"S-{id}",
-                width=MAPPER_PREVIEW_MAX_WIDTH,
-                height=MAPPER_PREVIEW_MAX_HEIGHT,
-            )
-            source_image.grid(row=id, column=1, padx=10, pady=10)
-            source_image.configure(image=tk_image)
+        x_label = ctk.CTkLabel(
+            row_frame,
+            text=f"X",
+            width=30,
+        )
+        x_label.pack(side="left", padx=(0, 10))
+
+        target_button = DragDropButton(  # Use DragDropButton for target
+            row_frame,
+            text="Select target image",
+            command=lambda id=id: on_tbutton_click(map, id),
+            width=DEFAULT_BUTTON_WIDTH,
+            height=DEFAULT_BUTTON_HEIGHT,
+            fg_color=("gray75", "gray25"),
+            hover_color=("gray85", "gray35"),
+            corner_radius=10,
+        )
+
+        target_button.handle_drop = lambda file_path, id=id: update_webcam_target(
+            scrollable_frame, map, id, file_path
+        )  # Add handle_drop for drag and drop
+        target_button.pack(side="left", padx=(0, 10))
+
+        target_image_label = ctk.CTkLabel(  # Create a label for target image
+            row_frame,
+            text=f"T-{id}",
+            width=MAPPER_PREVIEW_MAX_WIDTH,
+            height=MAPPER_PREVIEW_MAX_HEIGHT,
+        )
+        target_image_label.pack(side="left")
 
         if "target" in item:
             image = Image.fromarray(
@@ -1008,15 +1122,7 @@ def refresh_data(map: list):
                 (MAPPER_PREVIEW_MAX_WIDTH, MAPPER_PREVIEW_MAX_HEIGHT), Image.LANCZOS
             )
             tk_image = ctk.CTkImage(image, size=image.size)
-
-            target_image = ctk.CTkLabel(
-                scrollable_frame,
-                text=f"T-{id}",
-                width=MAPPER_PREVIEW_MAX_WIDTH,
-                height=MAPPER_PREVIEW_MAX_HEIGHT,
-            )
-            target_image.grid(row=id, column=4, padx=20, pady=10)
-            target_image.configure(image=tk_image)
+            target_image_label.configure(image=tk_image)
 
 
 def update_webcam_source(
@@ -1058,30 +1164,31 @@ def update_webcam_source(
             )
             tk_image = ctk.CTkImage(image, size=image.size)
 
-            source_image = ctk.CTkLabel(
-                scrollable_frame,
-                text=f"S-{button_num}",
-                width=MAPPER_PREVIEW_MAX_WIDTH,
-                height=MAPPER_PREVIEW_MAX_HEIGHT,
-            )
-            source_image.grid(row=button_num, column=1, padx=10, pady=10)
-            source_image.configure(image=tk_image)
-            source_label_dict_live[button_num] = source_image
+            # Find the source image label in the row frame
+            row_frame = scrollable_frame.winfo_children()[button_num]
+            source_image_label = row_frame.winfo_children()[1]
+
+            source_image_label.configure(image=tk_image)
+            source_label_dict_live[button_num] = source_image_label
         else:
             update_pop_live_status("Face could not be detected in last upload!")
         return map
 
 
 def update_webcam_target(
-    scrollable_frame: ctk.CTkScrollableFrame, map: list, button_num: int
+    scrollable_frame: ctk.CTkScrollableFrame,
+    map: list,
+    button_num: int,
+    target_path: str = None,
 ) -> list:
     global target_label_dict_live
 
-    target_path = ctk.filedialog.askopenfilename(
-        title="select an target image",
-        initialdir=RECENT_DIRECTORY_SOURCE,
-        filetypes=[img_ft],
-    )
+    if target_path is None:
+        target_path = ctk.filedialog.askopenfilename(
+            title="select an target image",
+            initialdir=RECENT_DIRECTORY_SOURCE,
+            filetypes=[img_ft],
+        )
 
     if "target" in map[button_num]:
         map[button_num].pop("target")
@@ -1111,15 +1218,12 @@ def update_webcam_target(
             )
             tk_image = ctk.CTkImage(image, size=image.size)
 
-            target_image = ctk.CTkLabel(
-                scrollable_frame,
-                text=f"T-{button_num}",
-                width=MAPPER_PREVIEW_MAX_WIDTH,
-                height=MAPPER_PREVIEW_MAX_HEIGHT,
-            )
-            target_image.grid(row=button_num, column=4, padx=20, pady=10)
-            target_image.configure(image=tk_image)
-            target_label_dict_live[button_num] = target_image
+            # Find the target image label in the row frame
+            row_frame = scrollable_frame.winfo_children()[button_num]
+            target_image_label = row_frame.winfo_children()[4]
+
+            target_image_label.configure(image=tk_image)
+            target_label_dict_live[button_num] = target_image_label
         else:
             update_pop_live_status("Face could not be detected in last upload!")
         return map