diff --git a/frontend/src/libs/fleet.ts b/frontend/src/libs/fleet.ts
index c3a791235..3a56e23b9 100644
--- a/frontend/src/libs/fleet.ts
+++ b/frontend/src/libs/fleet.ts
@@ -26,6 +26,18 @@ export const getStatusIconType = (status: IInstance['status']): StatusIndicatorP
     }
 };
 
+export const getStatusIconColor = (status: IInstance['status']): StatusIndicatorProps.Color | undefined => {
+    switch (status) {
+        case 'busy':
+        case 'provisioning':
+        case 'starting':
+        case 'terminating':
+            return 'blue';
+        default:
+            return undefined;
+    }
+};
+
 export const getFleetStatusIconType = (status: IFleet['status']): StatusIndicatorProps['type'] => {
     switch (status) {
         case 'submitted':
diff --git a/frontend/src/libs/run.ts b/frontend/src/libs/run.ts
index 60f4a5108..d0773e15b 100644
--- a/frontend/src/libs/run.ts
+++ b/frontend/src/libs/run.ts
@@ -52,9 +52,10 @@ export const getStatusIconColor = (
     switch (status) {
         case 'submitted':
         case 'pending':
-            return 'blue';
+        case 'provisioning':
         case 'pulling':
-            return 'green';
+        case 'terminating':
+            return 'blue';
         case 'aborted':
             return 'yellow';
         case 'done':
diff --git a/frontend/src/pages/Instances/Details/InstanceDetails/index.tsx b/frontend/src/pages/Instances/Details/InstanceDetails/index.tsx
index 408698b77..6b048729a 100644
--- a/frontend/src/pages/Instances/Details/InstanceDetails/index.tsx
+++ b/frontend/src/pages/Instances/Details/InstanceDetails/index.tsx
@@ -6,7 +6,7 @@ import { format } from 'date-fns';
 import { Box, ColumnLayout, Container, Header, Loader, NavigateLink, StatusIndicator } from 'components';
 
 import { DATE_TIME_FORMAT } from 'consts';
-import { formatBackend, getStatusIconType } from 'libs/fleet';
+import { formatBackend, getStatusIconColor, getStatusIconType } from 'libs/fleet';
 import { getHealthStatusIconType, prettyEnumValue } from 'libs/instance';
 import { formatResources } from 'libs/resources';
 import { ROUTES } from 'routes';
@@ -52,9 +52,7 @@ export const InstanceDetails = () => {
                             <Box variant="awsui-key-label">{t('fleets.fleet')}</Box>
                             <div>
                                 {data.fleet_name && data.fleet_id ? (
-                                    <NavigateLink
-                                        href={ROUTES.FLEETS.DETAILS.FORMAT(data.project_name, data.fleet_id)}
-                                    >
+                                    <NavigateLink href={ROUTES.FLEETS.DETAILS.FORMAT(data.project_name, data.fleet_id)}>
                                         {data.fleet_name}
                                     </NavigateLink>
                                 ) : (
@@ -66,7 +64,10 @@ export const InstanceDetails = () => {
                         <div>
                             <Box variant="awsui-key-label">{t('fleets.instances.status')}</Box>
                             <div>
-                                <StatusIndicator type={getStatusIconType(data.status)}>
+                                <StatusIndicator
+                                    type={getStatusIconType(data.status)}
+                                    colorOverride={getStatusIconColor(data.status)}
+                                >
                                     {(data.status === 'idle' || data.status === 'busy') &&
                                     data.total_blocks !== null &&
                                     data.total_blocks > 1
@@ -98,17 +99,13 @@ export const InstanceDetails = () => {
 
                         <div>
                             <Box variant="awsui-key-label">{t('fleets.instances.finished_at')}</Box>
-                            <div>
-                                {data.finished_at ? format(new Date(data.finished_at), DATE_TIME_FORMAT) : '-'}
-                            </div>
+                            <div>{data.finished_at ? format(new Date(data.finished_at), DATE_TIME_FORMAT) : '-'}</div>
                         </div>
 
                         {data.termination_reason && (
                             <div>
                                 <Box variant="awsui-key-label">{t('fleets.instances.termination_reason')}</Box>
-                                <div>
-                                    {data.termination_reason_message ?? prettyEnumValue(data.termination_reason)}
-                                </div>
+                                <div>{data.termination_reason_message ?? prettyEnumValue(data.termination_reason)}</div>
                             </div>
                         )}
 
diff --git a/frontend/src/pages/Instances/List/hooks/useColumnDefinitions.tsx b/frontend/src/pages/Instances/List/hooks/useColumnDefinitions.tsx
index c00834fb2..98b1ddd2b 100644
--- a/frontend/src/pages/Instances/List/hooks/useColumnDefinitions.tsx
+++ b/frontend/src/pages/Instances/List/hooks/useColumnDefinitions.tsx
@@ -5,7 +5,7 @@ import { format } from 'date-fns';
 import { Icon, NavigateLink, StatusIndicator, TableProps } from 'components';
 
 import { DATE_TIME_FORMAT } from 'consts';
-import { formatBackend, getStatusIconType } from 'libs/fleet';
+import { formatBackend, getStatusIconColor, getStatusIconType } from 'libs/fleet';
 import { formatInstanceStatusText, getHealthStatusIconType, prettyEnumValue } from 'libs/instance';
 import { formatResources } from 'libs/resources';
 import { ROUTES } from 'routes';
@@ -50,7 +50,9 @@ export const useColumnsDefinitions = () => {
             id: 'status',
             header: t('fleets.instances.status'),
             cell: (item) => (
-                <StatusIndicator type={getStatusIconType(item.status)}>{formatInstanceStatusText(item)}</StatusIndicator>
+                <StatusIndicator type={getStatusIconType(item.status)} colorOverride={getStatusIconColor(item.status)}>
+                    {formatInstanceStatusText(item)}
+                </StatusIndicator>
             ),
         },
         {
diff --git a/frontend/src/pages/Project/Details/Settings/index.tsx b/frontend/src/pages/Project/Details/Settings/index.tsx
index 32e5cbb17..e93b51318 100644
--- a/frontend/src/pages/Project/Details/Settings/index.tsx
+++ b/frontend/src/pages/Project/Details/Settings/index.tsx
@@ -4,7 +4,6 @@ import { useDispatch } from 'react-redux';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import { debounce } from 'lodash';
 import { ExpandableSection, Tabs } from '@cloudscape-design/components';
-import Wizard from '@cloudscape-design/components/wizard';
 import { FetchBaseQueryError } from '@reduxjs/toolkit/query';
 
 import {
@@ -316,8 +315,6 @@ export const ProjectSettings: React.FC = () => {
             });
     };
 
-    const [activeStepIndex, setActiveStepIndex] = React.useState(0);
-
     const projectDontHasFleet = !projectHavingFleetMap?.[paramProjectName];
 
     if (isLoadingPage)
@@ -339,157 +336,115 @@ export const ProjectSettings: React.FC = () => {
                             headerText="CLI"
                             expanded={isExpandedCliSection}
                             onChange={({ detail }) => setIsExpandedCliSection(detail.expanded)}
-                            headerActions={
-                                <Button
-                                    iconName="script"
-                                    variant={isExpandedCliSection ? 'normal' : 'primary'}
-                                    onClick={() => setIsExpandedCliSection((prev) => !prev)}
-                                />
-                            }
                             // headerInfo={<InfoLink onFollow={() => openHelpPanel(CLI_INFO)} />}
                         >
-                            <Wizard
-                                i18nStrings={{
-                                    stepNumberLabel: (stepNumber) => `Step ${stepNumber}`,
-                                    collapsedStepsLabel: (stepNumber, stepsCount) => `Step ${stepNumber} of ${stepsCount}`,
-                                    skipToButtonLabel: (step) => `Skip to ${step.title}`,
-                                    navigationAriaLabel: 'Steps',
-                                    // cancelButton: "Cancel",
-                                    previousButton: 'Previous',
-                                    nextButton: 'Next',
-                                    optional: 'required',
-                                }}
-                                onNavigate={({ detail }) => setActiveStepIndex(detail.requestedStepIndex)}
-                                activeStepIndex={activeStepIndex}
-                                onSubmit={() => setIsExpandedCliSection(false)}
-                                submitButtonText="Done"
-                                allowSkipTo={true}
-                                steps={[
-                                    {
-                                        title: 'Install',
-                                        // info: <InfoLink onFollow={() => openHelpPanel(CLI_INFO)} />,
-                                        description: 'To use dstack, install the CLI on your local machine.',
-                                        content: (
-                                            <Hotspot hotspotId={HotspotIds.INSTALL_CLI_COMMAND}>
-                                                <Tabs
-                                                    variant="stacked"
-                                                    tabs={[
-                                                        {
-                                                            label: 'uv',
-                                                            id: 'uv',
-                                                            content: (
-                                                                <>
-                                                                    <div className={styles.codeWrapper}>
-                                                                        <Code className={styles.code}>
-                                                                            uv tool install dstack -U
-                                                                        </Code>
-
-                                                                        <div className={styles.copy}>
-                                                                            <Popover
-                                                                                dismissButton={false}
-                                                                                position="top"
-                                                                                size="small"
-                                                                                triggerType="custom"
-                                                                                content={
-                                                                                    <StatusIndicator type="success">
-                                                                                        {t('common.copied')}
-                                                                                    </StatusIndicator>
-                                                                                }
-                                                                            >
-                                                                                <Button
-                                                                                    formAction="none"
-                                                                                    iconName="copy"
-                                                                                    variant="normal"
-                                                                                    onClick={() =>
-                                                                                        copyToClipboard(
-                                                                                            'uv tool install dstack -U',
-                                                                                        )
-                                                                                    }
-                                                                                />
-                                                                            </Popover>
-                                                                        </div>
-                                                                    </div>
-                                                                </>
-                                                            ),
-                                                        },
-                                                        {
-                                                            label: 'pip',
-                                                            id: 'pip',
-                                                            content: (
-                                                                <>
-                                                                    <div className={styles.codeWrapper}>
-                                                                        <Code className={styles.code}>
-                                                                            pip install dstack -U
-                                                                        </Code>
-
-                                                                        <div className={styles.copy}>
-                                                                            <Popover
-                                                                                dismissButton={false}
-                                                                                position="top"
-                                                                                size="small"
-                                                                                triggerType="custom"
-                                                                                content={
-                                                                                    <StatusIndicator type="success">
-                                                                                        {t('common.copied')}
-                                                                                    </StatusIndicator>
-                                                                                }
-                                                                            >
-                                                                                <Button
-                                                                                    formAction="none"
-                                                                                    iconName="copy"
-                                                                                    variant="normal"
-                                                                                    onClick={() =>
-                                                                                        copyToClipboard('pip install dstack -U')
-                                                                                    }
-                                                                                />
-                                                                            </Popover>
-                                                                        </div>
-                                                                    </div>
-                                                                </>
-                                                            ),
-                                                        },
-                                                    ]}
+                            <SpaceBetween size="s">
+                                <Box>To use dstack with this project, run the following command.</Box>
+
+                                <div className={styles.codeWrapper}>
+                                    <Hotspot hotspotId={HotspotIds.CONFIGURE_CLI_COMMAND}>
+                                        <Code className={styles.code}>{configCliCommand}</Code>
+
+                                        <div className={styles.copy}>
+                                            <Popover
+                                                dismissButton={false}
+                                                position="top"
+                                                size="small"
+                                                triggerType="custom"
+                                                content={<StatusIndicator type="success">{t('common.copied')}</StatusIndicator>}
+                                            >
+                                                <Button
+                                                    formAction="none"
+                                                    iconName="copy"
+                                                    variant="normal"
+                                                    onClick={copyCliCommand}
                                                 />
-                                            </Hotspot>
-                                        ),
-                                        isOptional: true,
-                                    },
-                                    {
-                                        title: 'Add project',
-                                        // info: <InfoLink onFollow={() => openHelpPanel(CLI_INFO)} />,
-                                        description: 'To use dstack with this project, run the following command.',
-                                        content: (
-                                            <div className={styles.codeWrapper}>
-                                                <Hotspot hotspotId={HotspotIds.CONFIGURE_CLI_COMMAND}>
-                                                    <Code className={styles.code}>{configCliCommand}</Code>
-
-                                                    <div className={styles.copy}>
-                                                        <Popover
-                                                            dismissButton={false}
-                                                            position="top"
-                                                            size="small"
-                                                            triggerType="custom"
-                                                            content={
-                                                                <StatusIndicator type="success">
-                                                                    {t('common.copied')}
-                                                                </StatusIndicator>
-                                                            }
-                                                        >
-                                                            <Button
-                                                                formAction="none"
-                                                                iconName="copy"
-                                                                variant="normal"
-                                                                onClick={copyCliCommand}
-                                                            />
-                                                        </Popover>
-                                                    </div>
-                                                </Hotspot>
-                                            </div>
-                                        ),
-                                        isOptional: true,
-                                    },
-                                ]}
-                            />
+                                            </Popover>
+                                        </div>
+                                    </Hotspot>
+                                </div>
+
+                                <ExpandableSection headerText="No CLI installed?">
+                                    <SpaceBetween size="s">
+                                        <Box />
+                                        <Box>To use dstack, install the CLI on your local machine.</Box>
+
+                                        <Tabs
+                                            variant="container"
+                                            tabs={[
+                                                {
+                                                    label: 'uv',
+                                                    id: 'uv',
+                                                    content: (
+                                                        <>
+                                                            <div className={styles.codeWrapper}>
+                                                                <Code className={styles.code}>uv tool install dstack -U</Code>
+
+                                                                <div className={styles.copy}>
+                                                                    <Popover
+                                                                        dismissButton={false}
+                                                                        position="top"
+                                                                        size="small"
+                                                                        triggerType="custom"
+                                                                        content={
+                                                                            <StatusIndicator type="success">
+                                                                                {t('common.copied')}
+                                                                            </StatusIndicator>
+                                                                        }
+                                                                    >
+                                                                        <Button
+                                                                            formAction="none"
+                                                                            iconName="copy"
+                                                                            variant="normal"
+                                                                            onClick={() =>
+                                                                                copyToClipboard('uv tool install dstack -U')
+                                                                            }
+                                                                        />
+                                                                    </Popover>
+                                                                </div>
+                                                            </div>
+                                                        </>
+                                                    ),
+                                                },
+                                                {
+                                                    label: 'pip',
+                                                    id: 'pip',
+                                                    content: (
+                                                        <>
+                                                            <div className={styles.codeWrapper}>
+                                                                <Code className={styles.code}>pip install dstack -U</Code>
+
+                                                                <div className={styles.copy}>
+                                                                    <Popover
+                                                                        dismissButton={false}
+                                                                        position="top"
+                                                                        size="small"
+                                                                        triggerType="custom"
+                                                                        content={
+                                                                            <StatusIndicator type="success">
+                                                                                {t('common.copied')}
+                                                                            </StatusIndicator>
+                                                                        }
+                                                                    >
+                                                                        <Button
+                                                                            formAction="none"
+                                                                            iconName="copy"
+                                                                            variant="normal"
+                                                                            onClick={() =>
+                                                                                copyToClipboard('pip install dstack -U')
+                                                                            }
+                                                                        />
+                                                                    </Popover>
+                                                                </div>
+                                                            </div>
+                                                        </>
+                                                    ),
+                                                },
+                                            ]}
+                                        />
+                                    </SpaceBetween>
+                                </ExpandableSection>
+                            </SpaceBetween>
                         </ExpandableSection>
                     )}
 
diff --git a/frontend/src/pages/Runs/Details/RunDetails/ConnectToRunWithDevEnvConfiguration/index.tsx b/frontend/src/pages/Runs/Details/RunDetails/ConnectToRunWithDevEnvConfiguration/index.tsx
index bcd618a0d..ad2c13fb5 100644
--- a/frontend/src/pages/Runs/Details/RunDetails/ConnectToRunWithDevEnvConfiguration/index.tsx
+++ b/frontend/src/pages/Runs/Details/RunDetails/ConnectToRunWithDevEnvConfiguration/index.tsx
@@ -55,13 +55,6 @@ export const ConnectToRunWithDevEnvConfiguration: FC<{ run: IRun }> = ({ run })
             headerText="Connect"
             expanded={isExpandedConnectSection}
             onChange={({ detail }) => setIsExpandedConnectSection(detail.expanded)}
-            headerActions={
-                <Button
-                    iconName="script"
-                    variant={isExpandedConnectSection ? 'normal' : 'primary'}
-                    onClick={() => setIsExpandedConnectSection((prev) => !prev)}
-                />
-            }
         >
             {run.status === 'running' && (
                 <Wizard
diff --git a/frontend/src/pages/Runs/Details/RunDetails/ConnectToServiceRun/index.tsx b/frontend/src/pages/Runs/Details/RunDetails/ConnectToServiceRun/index.tsx
index f51564e6d..740e8c1b8 100644
--- a/frontend/src/pages/Runs/Details/RunDetails/ConnectToServiceRun/index.tsx
+++ b/frontend/src/pages/Runs/Details/RunDetails/ConnectToServiceRun/index.tsx
@@ -24,13 +24,6 @@ export const ConnectToServiceRun: FC<{ run: IRun }> = ({ run }) => {
             headerText="Connect"
             expanded={isExpandedEndpointSection}
             onChange={({ detail }) => setIsExpandedEndpointSection(detail.expanded)}
-            headerActions={
-                <Button
-                    iconName="script"
-                    variant={isExpandedEndpointSection ? 'normal' : 'primary'}
-                    onClick={() => setIsExpandedEndpointSection((prev) => !prev)}
-                />
-            }
         >
             {run.status !== 'running' && (
                 <SpaceBetween size="s">
diff --git a/frontend/src/pages/Runs/Details/RunDetails/ConnectToTaskRun/index.tsx b/frontend/src/pages/Runs/Details/RunDetails/ConnectToTaskRun/index.tsx
index d9e72ea2c..976dfb5dd 100644
--- a/frontend/src/pages/Runs/Details/RunDetails/ConnectToTaskRun/index.tsx
+++ b/frontend/src/pages/Runs/Details/RunDetails/ConnectToTaskRun/index.tsx
@@ -43,13 +43,6 @@ export const ConnectToTaskRun: FC<{ run: IRun }> = ({ run }) => {
             headerText="Connect"
             expanded={isExpandedConnectSection}
             onChange={({ detail }) => setIsExpandedConnectSection(detail.expanded)}
-            headerActions={
-                <Button
-                    iconName="script"
-                    variant={isExpandedConnectSection ? 'normal' : 'primary'}
-                    onClick={() => setIsExpandedConnectSection((prev) => !prev)}
-                />
-            }
         >
             {run.status === 'running' && (
                 <Wizard