diff --git a/joi/src/core/Tabs/styles.scss b/joi/src/core/Tabs/styles.scss
index ce3df013b2..932b8431af 100644
--- a/joi/src/core/Tabs/styles.scss
+++ b/joi/src/core/Tabs/styles.scss
@@ -35,6 +35,7 @@
     flex: 1;
     height: 38px;
     display: flex;
+    white-space: nowrap;
     color: hsla(var(--text-secondary));
     align-items: center;
     justify-content: center;
diff --git a/web/screens/Hub/index.tsx b/web/screens/Hub/index.tsx
index 37adb717c7..8148a6bb5c 100644
--- a/web/screens/Hub/index.tsx
+++ b/web/screens/Hub/index.tsx
@@ -96,17 +96,19 @@ const HubScreen = () => {
           {!filteredModels.length ? (
             <BlankState title="No search results found" />
           ) : (
-            <div className="mb-4 flex w-full justify-end">
-              <Select
-                value={sortSelected}
-                onValueChange={(value) => {
-                  setSortSelected(value)
-                }}
-                options={sortMenus}
-              />
-            </div>
+            <>
+              <div className="mb-4 flex w-full justify-end">
+                <Select
+                  value={sortSelected}
+                  onValueChange={(value) => {
+                    setSortSelected(value)
+                  }}
+                  options={sortMenus}
+                />
+              </div>
+              <ModelList models={filteredModels} />
+            </>
           )}
-          <ModelList models={filteredModels} />
         </div>
       </ScrollArea>
     </CenterPanelContainer>
diff --git a/web/screens/LocalServer/LocalServerLeftPanel/index.tsx b/web/screens/LocalServer/LocalServerLeftPanel/index.tsx
index ef2c2d76c5..6f5de80ecd 100644
--- a/web/screens/LocalServer/LocalServerLeftPanel/index.tsx
+++ b/web/screens/LocalServer/LocalServerLeftPanel/index.tsx
@@ -127,9 +127,10 @@ const LocalServerLeftPanel = () => {
               {serverEnabled ? 'Stop' : 'Start'} Server
             </Button>
             {serverEnabled && (
-              <Button variant="soft" asChild>
+              <Button variant="soft" asChild className="whitespace-nowrap">
                 <a href={`http://localhost:${port}`} target="_blank">
-                  API Playground <ExternalLinkIcon size={20} className="ml-2" />
+                  <span>API Playground</span>{' '}
+                  <ExternalLinkIcon size={20} className="ml-2" />
                 </a>
               </Button>
             )}
diff --git a/web/screens/Settings/Advanced/index.tsx b/web/screens/Settings/Advanced/index.tsx
index 2c444371a8..bbfe7274cd 100644
--- a/web/screens/Settings/Advanced/index.tsx
+++ b/web/screens/Settings/Advanced/index.tsx
@@ -211,9 +211,6 @@ const Advanced = () => {
     saveSettings({ gpusInUse: updatedGpusInUse })
   }
 
-  const gpuSelectionPlaceHolder =
-    gpuList.length > 0 ? 'Select GPU' : "You don't have any compatible GPU"
-
   /**
    * Handle click outside
    */
@@ -240,7 +237,7 @@ const Advanced = () => {
         </div>
 
         {/* CPU / GPU switching */}
-        {!isMac && (
+        {!isMac && gpuList.length > 0 && (
           <div className="flex w-full flex-col items-start justify-between border-b border-[hsla(var(--app-border))] py-4 first:pt-0 last:border-none">
             <div className="flex w-full items-start justify-between">
               <div className="space-y-1">
@@ -326,7 +323,7 @@ const Advanced = () => {
                   value={selectedGpu.join() || ''}
                   className="w-full cursor-pointer"
                   readOnly
-                  placeholder={gpuSelectionPlaceHolder}
+                  placeholder=""
                   suffixIcon={
                     <ChevronDownIcon
                       size={14}