diff --git a/src/renderer/App.css b/src/renderer/App.css
index e58e97e..c1d8a1f 100644
--- a/src/renderer/App.css
+++ b/src/renderer/App.css
@@ -145,7 +145,7 @@ button.selected {
 }
 
 .subtitle-list {
-    max-height: 200px;
+    height: 200px;
     overflow-y: scroll;
 }
 
@@ -200,6 +200,14 @@ button.selected {
     }
 }
 
+.subtitle-window table td:nth-child(2) {
+    width: 250px;
+}
+
+.subtitle-window input {
+    width: 100%;
+}
+
 .video-list-element {
     border: 1px solid transparent;
     border-radius: 10px;
diff --git a/src/renderer/App.jsx b/src/renderer/App.jsx
index 85ab80e..2fd4a4f 100644
--- a/src/renderer/App.jsx
+++ b/src/renderer/App.jsx
@@ -85,7 +85,8 @@ let App = (props) => {
                 {interstitialState.message}
             </Interstitial>
             {!location.pathname.includes(`/create`) &&
-            !location.pathname.includes(`/batch`) ? (
+            !location.pathname.includes(`/batch`) &&
+            !location.pathname.includes(`edit`) ? (
                 <div>
                     <header
                         style={{
diff --git a/src/renderer/components/ClipTable.jsx b/src/renderer/components/ClipTable.jsx
index 565ab7c..dc09a7a 100644
--- a/src/renderer/components/ClipTable.jsx
+++ b/src/renderer/components/ClipTable.jsx
@@ -50,7 +50,14 @@ export default ({
 
     return (
         <div>
-            <div>
+            <div
+                style={{
+                    position: 'sticky',
+                    top: '0px',
+                    zIndex: '10',
+                    backgroundColor: 'black',
+                }}
+            >
                 <label>Search:</label>
                 <input
                     type="text"
@@ -78,7 +85,6 @@ export default ({
             <div className="clip-table" style={{ margin: 'auto' }}>
                 {videos.map((video, index) => {
                     let opClass;
-                    let opFn;
                     switch (op) {
                         case 'remove':
                             opClass = 'removeable';
@@ -97,7 +103,7 @@ export default ({
                                 <div
                                     className="video-list-element"
                                     onClick={() => {
-                                        opFn(collectionId, videoId);
+                                        opFn(collectionId, video._id);
                                     }}
                                 >
                                     <div className={opClass}>
diff --git a/src/renderer/components/SubtitleList.jsx b/src/renderer/components/SubtitleList.jsx
index 0ad1750..834c2b0 100644
--- a/src/renderer/components/SubtitleList.jsx
+++ b/src/renderer/components/SubtitleList.jsx
@@ -18,6 +18,7 @@ let convertMillisecondsToTimestamp = (milliseconds) => {
 
 export default ({
     subs,
+    videoId,
     clipNumberOverride,
     titleOverride,
     currentSub,
@@ -42,6 +43,18 @@ export default ({
         getCollections();
     }, []);
 
+    useEffect(() => {
+        if (titleOverride && clipNumberOverride) {
+            let found = Object.keys(collections).find((collectionId) => {
+                return collections[collectionId].includes(videoId);
+            });
+
+            if (found) {
+                setSelectedCollection(found);
+            }
+        }
+    }, [collections]);
+
     const getCollections = async () => {
         let collections = await CollectionAPI.getCollections(game);
         setCollections(collections);
@@ -117,6 +130,7 @@ export default ({
                             <th>Index</th>
                             <th>In</th>
                             <th>Out</th>
+                            <th>Type</th>
                             <th></th>
                         </tr>
                     </thead>
@@ -145,6 +159,7 @@ export default ({
                                             sub.endTime
                                         )}
                                     </td>
+                                    <td>{sub.type}</td>
                                     <td>
                                         <button
                                             onClick={(e) => {
diff --git a/src/renderer/routes/VideoList.jsx b/src/renderer/routes/VideoList.jsx
index dc34d3e..d171511 100644
--- a/src/renderer/routes/VideoList.jsx
+++ b/src/renderer/routes/VideoList.jsx
@@ -111,7 +111,7 @@ let VideoList = () => {
                 videos={videos}
                 collections={collections}
                 op="open"
-                onOpen={(collectionId, id) => {
+                opFn={(collectionId, id) => {
                     navigate(`/edit/${id}`);
                 }}
                 onDelete={(id, game) => {
diff --git a/src/renderer/routes/editor/AdvancedEditor.jsx b/src/renderer/routes/editor/AdvancedEditor.jsx
index ed10da6..c91cbd8 100644
--- a/src/renderer/routes/editor/AdvancedEditor.jsx
+++ b/src/renderer/routes/editor/AdvancedEditor.jsx
@@ -31,6 +31,9 @@ let AdvancedEditor = () => {
         height: window.innerHeight,
     });
 
+    const [titleOverride, setTitleOverride] = useState(null);
+    const [clipNumberOverride, setClipNumberOverride] = useState(null);
+
     const [batchClip, setBatchClip] = useState(null);
     const [offset, setOffset] = useState(0);
     const [startTime, setStartTime] = useState(0);
@@ -313,6 +316,12 @@ let AdvancedEditor = () => {
             };
         });
 
+        let clipTextIndex = id.lastIndexOf('-Clip');
+        let clipNumber = id.slice(clipTextIndex + 5);
+        let title = id.slice(0, clipTextIndex);
+
+        setTitleOverride(title.replaceAll('_', ' '));
+        setClipNumberOverride(parseInt(clipNumber));
         setVideoSource(`game://${params.type}/${id}.mp4`);
 
         subtitles = distributeSubs(subtitles);
@@ -588,8 +597,11 @@ let AdvancedEditor = () => {
                             currentSliderPosition={
                                 currentSliderPosition - offset
                             }
-                            clipNumberOverride={batchClip?.clipNumber}
-                            titleOverride={batchClip?.title}
+                            videoId={id}
+                            clipNumberOverride={
+                                batchClip?.clipNumber || clipNumberOverride
+                            }
+                            titleOverride={batchClip?.title || titleOverride}
                             currentSub={currentSub}
                             currentRow={currentRow}
                             offset={offset}
diff --git a/src/renderer/util/VideoTools.js b/src/renderer/util/VideoTools.js
index 4fa1f31..135ddb0 100644
--- a/src/renderer/util/VideoTools.js
+++ b/src/renderer/util/VideoTools.js
@@ -72,6 +72,8 @@ export let convertSrtToSubtitles = (srtBase64) => {
     let n = 0;
 
     srt.split('\n').forEach((line) => {
+        console.log('LINE: ' + line);
+        console.log('n: ' + n);
         switch (n++) {
             case 0:
                 break;
@@ -102,7 +104,7 @@ export let convertSrtToSubtitles = (srtBase64) => {
                 break;
         }
     });
-    if (n === 0) {
+    if (subtitle.text) {
         subtitles.push(subtitle);
     }