diff --git a/packages/dashboard/src/components/micro-app.tsx b/packages/dashboard/src/components/micro-app.tsx
index 087cc9097..8dd68d855 100644
--- a/packages/dashboard/src/components/micro-app.tsx
+++ b/packages/dashboard/src/components/micro-app.tsx
@@ -36,7 +36,6 @@ export function createMicroApp<P>(
         const settings = useSettings();
         return (
           <Window ref={ref} title={displayName} {...otherProps}>
-            {/* TODO(koonpeng): Implement fallback */}
             <Suspense fallback={null}>
               <LazyComponent {...props(settings)} />
             </Suspense>
diff --git a/packages/dashboard/src/components/tasks/tasks-window.tsx b/packages/dashboard/src/components/tasks/tasks-window.tsx
index 7c8b737c1..2b62a51f8 100644
--- a/packages/dashboard/src/components/tasks/tasks-window.tsx
+++ b/packages/dashboard/src/components/tasks/tasks-window.tsx
@@ -10,7 +10,6 @@ import {
   Tab,
   TableContainer,
   Tabs,
-  Toolbar,
   Tooltip,
   useMediaQuery,
 } from '@mui/material';
@@ -301,59 +300,57 @@ export const TasksWindow = React.memo(
           title="Tasks"
           onClose={onClose}
           toolbar={
-            <Toolbar variant="dense">
-              <div>
-                <Tooltip title="Export task history of the past 31 days" placement="top">
-                  <Button
-                    sx={{
-                      fontSize: isScreenHeightLessThan800 ? '0.7rem' : 'inherit',
-                      paddingTop: isScreenHeightLessThan800 ? 0 : 'inherit',
-                      paddingBottom: isScreenHeightLessThan800 ? 0 : 'inherit',
-                      marginBottom: isScreenHeightLessThan800 ? 1.8 : 'inherit',
-                    }}
-                    id="export-button"
-                    aria-controls={openExportMenu ? 'export-menu' : undefined}
-                    aria-haspopup="true"
-                    aria-expanded={openExportMenu ? 'true' : undefined}
-                    variant="outlined"
-                    onClick={handleClickExportMenu}
-                    color="inherit"
-                    startIcon={
-                      <DownloadIcon transform={`scale(${isScreenHeightLessThan800 ? 0.8 : 1})`} />
-                    }
-                  >
-                    Export past 31 days
-                  </Button>
-                </Tooltip>
-                <Menu
-                  id="export-menu"
-                  MenuListProps={{
-                    'aria-labelledby': 'export-button',
+            <Box display="flex" gap={1} marginRight={1}>
+              <Tooltip title="Export task history of the past 31 days" placement="top">
+                <Button
+                  sx={{
+                    fontSize: isScreenHeightLessThan800 ? '0.7rem' : 'inherit',
+                    paddingTop: isScreenHeightLessThan800 ? 0 : 'inherit',
+                    paddingBottom: isScreenHeightLessThan800 ? 0 : 'inherit',
+                    marginBottom: isScreenHeightLessThan800 ? 1.8 : 'inherit',
                   }}
-                  anchorEl={anchorExportElement}
-                  open={openExportMenu}
-                  onClose={handleCloseExportMenu}
+                  id="export-button"
+                  aria-controls={openExportMenu ? 'export-menu' : undefined}
+                  aria-haspopup="true"
+                  aria-expanded={openExportMenu ? 'true' : undefined}
+                  variant="outlined"
+                  onClick={handleClickExportMenu}
+                  color="inherit"
+                  startIcon={
+                    <DownloadIcon transform={`scale(${isScreenHeightLessThan800 ? 0.8 : 1})`} />
+                  }
                 >
-                  <MenuItem
-                    onClick={() => {
-                      exportTasksToCsv(true);
-                      handleCloseExportMenu();
-                    }}
-                    disableRipple
-                  >
-                    Export Minimal
-                  </MenuItem>
-                  <MenuItem
-                    onClick={() => {
-                      exportTasksToCsv(false);
-                      handleCloseExportMenu();
-                    }}
-                    disableRipple
-                  >
-                    Export Full
-                  </MenuItem>
-                </Menu>
-              </div>
+                  Export past 31 days
+                </Button>
+              </Tooltip>
+              <Menu
+                id="export-menu"
+                MenuListProps={{
+                  'aria-labelledby': 'export-button',
+                }}
+                anchorEl={anchorExportElement}
+                open={openExportMenu}
+                onClose={handleCloseExportMenu}
+              >
+                <MenuItem
+                  onClick={() => {
+                    exportTasksToCsv(true);
+                    handleCloseExportMenu();
+                  }}
+                  disableRipple
+                >
+                  Export Minimal
+                </MenuItem>
+                <MenuItem
+                  onClick={() => {
+                    exportTasksToCsv(false);
+                    handleCloseExportMenu();
+                  }}
+                  disableRipple
+                >
+                  Export Full
+                </MenuItem>
+              </Menu>
               <Tooltip title="Refreshes the task queue table" color="inherit" placement="top">
                 <Button
                   sx={{
@@ -376,7 +373,7 @@ export const TasksWindow = React.memo(
                   Refresh Task Queue
                 </Button>
               </Tooltip>
-            </Toolbar>
+            </Box>
           }
           {...otherProps}
         >
@@ -437,8 +434,8 @@ export const TasksWindow = React.memo(
                 task={selectedTask ?? undefined}
               />
             )}
-            {children}
           </Grid>
+          {children}
         </Window>
       );
     },
diff --git a/packages/react-components/lib/window/window-toolbar.tsx b/packages/react-components/lib/window/window-toolbar.tsx
index 3934f4b68..d62756201 100644
--- a/packages/react-components/lib/window/window-toolbar.tsx
+++ b/packages/react-components/lib/window/window-toolbar.tsx
@@ -15,9 +15,11 @@ export const WindowToolbar: React.FC<WindowToolbarProps> = ({
   return (
     <AppBar position="static" elevation={0} {...otherProps}>
       <Toolbar variant="dense" disableGutters sx={{ paddingLeft: 2 }}>
-        <Grid container justifyContent="space-between" alignItems="center">
+        <Grid container justifyContent="space-between" alignItems="center" wrap="nowrap">
           <Typography variant="h6">{title}</Typography>
-          <Box {...toolbarItemContainerProps}>{children}</Box>
+          <Box display="flex" alignItems="center" {...toolbarItemContainerProps}>
+            {children}
+          </Box>
         </Grid>
       </Toolbar>
     </AppBar>