diff --git a/tab_category_sorter.py b/tab_category_sorter.py
index ad6bd44..eeba3c1 100644
--- a/tab_category_sorter.py
+++ b/tab_category_sorter.py
@@ -9,18 +9,22 @@ def render(path_t, path_out, quality, naming_mode):
     if st.session_state.idx_cat < len(images):
         curr_p = os.path.join(path_t, images[st.session_state.idx_cat])
         
-        # Filmstrip
+        # Filmstrip (Current + Next 6)
         st.write("### 🎞️ Filmstrip")
         fs_cols = st.columns(7)
         for i, img_name in enumerate(images[st.session_state.idx_cat : st.session_state.idx_cat + 7]):
             fs_cols[i].image(SorterEngine.compress_for_web(os.path.join(path_t, img_name), 10))
 
+        st.divider()
+
         col_img, col_btns = st.columns([2, 1])
-        col_img.image(SorterEngine.compress_for_web(curr_p, quality))
+        col_img.image(SorterEngine.compress_for_web(curr_p, quality), caption=images[st.session_state.idx_cat])
         
         with col_btns:
             fid = SorterEngine.get_folder_id(path_t)
             st.write(f"**Folder ID:** {fid}")
+            
+            # Dynamic Category Buttons from SQL
             for cat in categories:
                 if st.button(cat, use_container_width=True):
                     _, ext = os.path.splitext(curr_p)
@@ -28,10 +32,21 @@ def render(path_t, path_out, quality, naming_mode):
                     dst_dir = os.path.join(path_out, cat)
                     os.makedirs(dst_dir, exist_ok=True)
                     dst_p = os.path.join(dst_dir, name)
-                    shutil.move(curr_p, dst_p)
-                    st.session_state.history.append({'type': 'cat_move', 't_src': curr_p, 't_dst': dst_p})
+                    
+                    # Handle collisions
+                    count = 2
+                    final_dst = dst_p
+                    while os.path.exists(final_dst):
+                        root, ext = os.path.splitext(name)
+                        final_dst = os.path.join(dst_dir, f"{root}_{count}{ext}")
+                        count += 1
+                        
+                    shutil.move(curr_p, final_dst)
+                    st.toast(f"Moved to {cat}")
                     st.rerun()
-            if st.button("SKIP"):
+                    
+            if st.button("⏭️ SKIP", type="secondary", use_container_width=True):
                 st.session_state.idx_cat += 1
                 st.rerun()
-    else: st.success("Finished Categorizing.")
\ No newline at end of file
+    else:
+        st.success("Finished Categorizing.")
\ No newline at end of file