diff --git a/frontend/app/tab/tabbar.scss b/frontend/app/tab/tabbar.scss
index 6c38d1c3f..b522696d3 100644
--- a/frontend/app/tab/tabbar.scss
+++ b/frontend/app/tab/tabbar.scss
@@ -78,14 +78,18 @@
     }
 
     .config-error-button {
+        margin-left: auto;
         height: 80%;
         margin: auto 4px;
         color: black;
         flex: 0 0 fit-content;
     }
 
+    .update-available-banner {
+        margin-left: auto;
+    }
+
     .add-tab-btn {
-        width: 22px;
         height: 100%;
         cursor: pointer;
         font-size: 14px;
@@ -95,6 +99,7 @@
         align-items: center;
         justify-content: center;
         opacity: 0.5;
+        padding: 0 10px;
 
         &:hover {
             opacity: 1;
diff --git a/frontend/app/tab/tabbar.tsx b/frontend/app/tab/tabbar.tsx
index 7a2efe97b..e50b7e2a6 100644
--- a/frontend/app/tab/tabbar.tsx
+++ b/frontend/app/tab/tabbar.tsx
@@ -226,7 +226,6 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
 
         const tabbarWrapperWidth = tabbarWrapperRef.current.getBoundingClientRect().width;
         const windowDragLeftWidth = draggerLeftRef.current.getBoundingClientRect().width;
-        const windowDragRightWidth = draggerRightRef.current.getBoundingClientRect().width;
         const addBtnWidth = addBtnRef.current.getBoundingClientRect().width;
         const updateStatusLabelWidth = updateStatusBannerRef.current?.getBoundingClientRect().width ?? 0;
         const configErrorWidth = configErrorButtonRef.current?.getBoundingClientRect().width ?? 0;
@@ -236,7 +235,6 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
 
         const nonTabElementsWidth =
             windowDragLeftWidth +
-            windowDragRightWidth +
             addBtnWidth +
             updateStatusLabelWidth +
             configErrorWidth +
@@ -683,7 +681,6 @@ const TabBar = memo(({ workspace }: TabBarProps) => {
             <div ref={addBtnRef} className="add-tab-btn" onClick={handleAddTab}>
                 <i className="fa fa-solid fa-plus fa-fw" />
             </div>
-            <WindowDrag ref={draggerRightRef} className="right" />
             <UpdateStatusBanner ref={updateStatusBannerRef} />
             <ConfigErrorIcon buttonRef={configErrorButtonRef} />
         </div>
diff --git a/frontend/app/tab/updatebanner.tsx b/frontend/app/tab/updatebanner.tsx
index fb1836693..24a0259e8 100644
--- a/frontend/app/tab/updatebanner.tsx
+++ b/frontend/app/tab/updatebanner.tsx
@@ -29,6 +29,7 @@ const UpdateStatusBannerComponent = forwardRef<HTMLDivElement>((_, ref) => {
             default:
                 break;
         }
+        message = "Update Available";
         setUpdateStatusMessage(message);
 
         // Clear any existing timeout