diff --git a/src/fireedge/src/client/components/Tables/styles.js b/src/fireedge/src/client/components/Tables/styles.js
index 4b77c76477..2b38f30bd8 100644
--- a/src/fireedge/src/client/components/Tables/styles.js
+++ b/src/fireedge/src/client/components/Tables/styles.js
@@ -62,7 +62,7 @@ export const rowStyles = makeStyles(
       color: palette.text.secondary,
       marginTop: 4,
       display: 'flex',
-      gap: '0.5em',
+      gap: '1em',
       alignItems: 'center',
       flexWrap: 'wrap',
       wordWrap: 'break-word',
diff --git a/src/fireedge/src/client/components/Tabs/Vm/Info/information.js b/src/fireedge/src/client/components/Tabs/Vm/Info/information.js
index b37f4a1054..c1b639d1e0 100644
--- a/src/fireedge/src/client/components/Tabs/Vm/Info/information.js
+++ b/src/fireedge/src/client/components/Tabs/Vm/Info/information.js
@@ -16,11 +16,12 @@
 import { ReactElement } from 'react'
 import PropTypes from 'prop-types'
 import { generatePath } from 'react-router-dom'
+import { Stack } from '@mui/material'
 
 import { useGetClusterQuery } from 'client/features/OneApi/cluster'
 import { useRenameVmMutation } from 'client/features/OneApi/vm'
 
-import { StatusChip } from 'client/components/Status'
+import { StatusCircle, StatusChip } from 'client/components/Status'
 import { List } from 'client/components/Tabs/Common'
 import { Translate } from 'client/components/HOC'
 import MultipleTags from 'client/components/MultipleTags'
@@ -86,7 +87,10 @@ const InformationPanel = ({ vm = {}, actions }) => {
     {
       name: T.State,
       value: (
-        <StatusChip dataCy="state" text={stateName} stateColor={stateColor} />
+        <Stack direction="row" alignItems="center" gap={1}>
+          <StatusCircle color={stateColor} tooltip={stateName} />
+          <StatusChip dataCy="state" text={stateName} stateColor={stateColor} />
+        </Stack>
       ),
     },
     {
diff --git a/src/fireedge/src/client/containers/VirtualMachines/index.js b/src/fireedge/src/client/containers/VirtualMachines/index.js
index fd3567e993..0263881a45 100644
--- a/src/fireedge/src/client/containers/VirtualMachines/index.js
+++ b/src/fireedge/src/client/containers/VirtualMachines/index.js
@@ -15,7 +15,7 @@
  * ------------------------------------------------------------------------- */
 /* eslint-disable jsdoc/require-jsdoc */
 import { useState } from 'react'
-import { Stack, Chip } from '@mui/material'
+import { Container, Typography, Stack, Chip } from '@mui/material'
 
 import { VmsTable } from 'client/components/Tables'
 import VmActions from 'client/components/Tables/Vms/actions'
@@ -34,30 +34,40 @@ function VirtualMachines() {
         globalActions={actions}
       />
 
-      {selectedRows?.length > 0 && (
-        <Stack overflow="auto" data-cy={'detail'}>
-          {selectedRows?.length === 1 ? (
-            <VmTabs id={selectedRows[0]?.original.ID} />
-          ) : (
-            <Stack direction="row" flexWrap="wrap" gap={1} alignItems="center">
-              <MultipleTags
-                limitTags={10}
-                tags={selectedRows?.map(
-                  ({ original, id, toggleRowSelected }) => (
-                    <Chip
-                      key={id}
-                      variant="outlined"
-                      label={original?.NAME ?? id}
-                      onDelete={() => toggleRowSelected(false)}
-                    />
-                  )
-                )}
-              />
-            </Stack>
-          )}
-        </Stack>
-      )}
-    </SplitPane>
+        {selectedRows?.length > 0 && (
+          <Stack overflow="auto" data-cy={'detail'}>
+            {selectedRows?.length === 1 ? (
+              <>
+                <Typography color="text.primary" noWrap mb={1}>
+                  {`#${selectedRows[0]?.original.ID} | ${selectedRows[0]?.original.NAME}`}
+                </Typography>
+                <VmTabs id={selectedRows[0]?.original.ID} />
+              </>
+            ) : (
+              <Stack
+                direction="row"
+                flexWrap="wrap"
+                gap={1}
+                alignItems="center"
+              >
+                <MultipleTags
+                  limitTags={10}
+                  tags={selectedRows?.map(
+                    ({ original, id, toggleRowSelected }) => (
+                      <Chip
+                        key={id}
+                        variant="outlined"
+                        label={original?.NAME ?? id}
+                        onDelete={() => toggleRowSelected(false)}
+                      />
+                    )
+                  )}
+                />
+              </Stack>
+            )}
+          </Stack>
+        )}
+      </SplitPane>
   )
 }
 
diff --git a/src/fireedge/src/client/containers/VmTemplates/index.js b/src/fireedge/src/client/containers/VmTemplates/index.js
index 42e8d4858a..26df16c49e 100644
--- a/src/fireedge/src/client/containers/VmTemplates/index.js
+++ b/src/fireedge/src/client/containers/VmTemplates/index.js
@@ -15,7 +15,7 @@
  * ------------------------------------------------------------------------- */
 /* eslint-disable jsdoc/require-jsdoc */
 import { useState } from 'react'
-import { Stack, Chip } from '@mui/material'
+import { Container, Typography, Stack, Chip } from '@mui/material'
 
 import { VmTemplatesTable } from 'client/components/Tables'
 import VmTemplateActions from 'client/components/Tables/VmTemplates/actions'
@@ -34,30 +34,40 @@ function VmTemplates() {
         globalActions={actions}
       />
 
-      {selectedRows?.length > 0 && (
-        <Stack overflow="auto">
-          {selectedRows?.length === 1 ? (
-            <VmTemplateTabs id={selectedRows[0]?.original.ID} />
-          ) : (
-            <Stack direction="row" flexWrap="wrap" gap={1} alignItems="center">
-              <MultipleTags
-                limitTags={10}
-                tags={selectedRows?.map(
-                  ({ original, id, toggleRowSelected }) => (
-                    <Chip
-                      key={id}
-                      variant="text"
-                      label={original?.NAME ?? id}
-                      onDelete={() => toggleRowSelected(false)}
-                    />
-                  )
-                )}
-              />
-            </Stack>
-          )}
-        </Stack>
-      )}
-    </SplitPane>
+        {selectedRows?.length > 0 && (
+          <Stack overflow="auto">
+            {selectedRows?.length === 1 ? (
+              <>
+                <Typography color="text.primary" noWrap mb={1}>
+                  {`#${selectedRows[0]?.original.ID} | ${selectedRows[0]?.original.NAME}`}
+                </Typography>
+                <VmTemplateTabs id={selectedRows[0]?.original.ID} />
+              </>
+            ) : (
+              <Stack
+                direction="row"
+                flexWrap="wrap"
+                gap={1}
+                alignItems="center"
+              >
+                <MultipleTags
+                  limitTags={10}
+                  tags={selectedRows?.map(
+                    ({ original, id, toggleRowSelected }) => (
+                      <Chip
+                        key={id}
+                        variant="text"
+                        label={original?.NAME ?? id}
+                        onDelete={() => toggleRowSelected(false)}
+                      />
+                    )
+                  )}
+                />
+              </Stack>
+            )}
+          </Stack>
+        )}
+      </SplitPane>
   )
 }