diff --git a/backend/api/Database/Context/InitDb.cs b/backend/api/Database/Context/InitDb.cs
index ee67918be..6f1036643 100644
--- a/backend/api/Database/Context/InitDb.cs
+++ b/backend/api/Database/Context/InitDb.cs
@@ -202,12 +202,8 @@ private static List<TaskDefinition> GetMissionTaskDefinitions()
                 Description = "dummy task 1",
                 RobotPose = new Pose(),
                 AnalysisTypes = [AnalysisType.Fencilla],
-                TargetPosition = new Position
-                {
-                    X = 0,
-                    Y = 0,
-                    Z = 0,
-                },
+                SensorType = SensorType.Image,
+                TargetPosition = new Position(),
             };
 
             var task2 = new TaskDefinition
@@ -216,13 +212,9 @@ private static List<TaskDefinition> GetMissionTaskDefinitions()
                 TagId = "dummy-tag-id-2",
                 Description = "dummy task 2",
                 RobotPose = new Pose(),
+                SensorType = SensorType.Image,
                 AnalysisTypes = [AnalysisType.CLOE],
-                TargetPosition = new Position
-                {
-                    X = 0,
-                    Y = 0,
-                    Z = 0,
-                },
+                TargetPosition = new Position(),
             };
 
             var task3 = new TaskDefinition
@@ -232,12 +224,8 @@ private static List<TaskDefinition> GetMissionTaskDefinitions()
                 Description = "dummy task 3",
                 RobotPose = new Pose(),
                 AnalysisTypes = [AnalysisType.CO2],
-                TargetPosition = new Position
-                {
-                    X = 0,
-                    Y = 0,
-                    Z = 0,
-                },
+                SensorType = SensorType.CO2Measurement,
+                TargetPosition = new Position(),
             };
 
             var task4 = new TaskDefinition
@@ -248,12 +236,7 @@ private static List<TaskDefinition> GetMissionTaskDefinitions()
                 RobotPose = new Pose(),
                 SensorType = SensorType.ThermalImage,
                 AnalysisTypes = [AnalysisType.ThermalReading],
-                TargetPosition = new Position
-                {
-                    X = 0,
-                    Y = 0,
-                    Z = 0,
-                },
+                TargetPosition = new Position(),
             };
 
             return new List<TaskDefinition>([task1, task2, task3, task4]);
@@ -347,6 +330,36 @@ private static List<MissionDefinition> GetMissionDefinitions()
                 LastSuccessfulRun = null,
             };
 
+            var onlyImagesWithoutAnalysisMissionDefinition = new MissionDefinition
+            {
+                Id = Guid.NewGuid().ToString(),
+                Name = "Only Images Without Analysis Mission",
+                InstallationCode = inspectionAreas[5].Installation.InstallationCode,
+                InspectionArea = inspectionAreas[5],
+                Tasks =
+                [
+                    new TaskDefinition
+                    {
+                        TagId = "image-tag-1",
+                        Description = "Tag to take image of",
+                        RobotPose = new Pose(),
+                        AnalysisTypes = [],
+                        SensorType = SensorType.Image,
+                        TargetPosition = new Position(),
+                    },
+                    new TaskDefinition
+                    {
+                        TagId = "image-tag-2",
+                        Description = "Tag to take image of",
+                        RobotPose = new Pose(),
+                        AnalysisTypes = [],
+                        SensorType = SensorType.Image,
+                        TargetPosition = new Position(),
+                    },
+                ],
+                LastSuccessfulRun = null,
+            };
+
             return new List<MissionDefinition>([
                 missionDefinition1,
                 missionDefinition2,
@@ -356,6 +369,7 @@ private static List<MissionDefinition> GetMissionDefinitions()
                 missionDefinition6,
                 thermalReadingMission,
                 cloeMission,
+                onlyImagesWithoutAnalysisMissionDefinition,
             ]);
         }
 
diff --git a/backend/api/Database/Models/TaskDefinition.cs b/backend/api/Database/Models/TaskDefinition.cs
index 7c6f055e8..eb253a7b5 100644
--- a/backend/api/Database/Models/TaskDefinition.cs
+++ b/backend/api/Database/Models/TaskDefinition.cs
@@ -50,7 +50,7 @@ public TaskDefinition(TaskQuery taskQuery, int index)
 
         public IList<AnalysisType> AnalysisTypes { get; set; } = [];
 
-        public SensorType SensorType { get; set; }
+        public SensorType SensorType { get; set; } // Note that the enum will get SensorType.Image as default
 
         public float? VideoDuration { get; set; }
 
diff --git a/frontend/src/models/InspectionRecord.ts b/frontend/src/models/InspectionRecord.ts
index 7a5d25cab..29e48a7b9 100644
--- a/frontend/src/models/InspectionRecord.ts
+++ b/frontend/src/models/InspectionRecord.ts
@@ -52,7 +52,7 @@ export interface FlotillaAnalysisResultMessage {
 export interface InspectionData {
     inspectionId: string
     analysisId: string
-    visualisedSAS?: string
+    visualizedSAS?: string
     fileType: FileType
     anonymizedSAS?: string
     analysisType?: string
@@ -94,7 +94,7 @@ export const inspectionRecordToInspectionData = (record: InspectionRecord): Insp
     return {
         inspectionId: record.inspectionId,
         analysisId: analysis.id,
-        visualisedSAS: analysis.visualizedSAS,
+        visualizedSAS: analysis.visualizedSAS,
         anonymizedSAS: analysis.anonymizedSAS,
         analysisType: record.inspectionType,
         tag: record.tag,
diff --git a/frontend/src/pages/InspectionReportPage/InspectionReportImage.tsx b/frontend/src/pages/InspectionReportPage/InspectionReportImage.tsx
index d9e8b391a..e68c012e6 100644
--- a/frontend/src/pages/InspectionReportPage/InspectionReportImage.tsx
+++ b/frontend/src/pages/InspectionReportPage/InspectionReportImage.tsx
@@ -162,7 +162,7 @@ const AnalysisImageWithPlaceholder = ({
     const { useSaraData } = useInspectionsContext()
     const { data, isPending, isError } = useSaraData(inspectionId)
 
-    if (!data?.visualisedSAS) {
+    if (!data?.visualizedSAS) {
         return <TextAsImage isLargeImage={isLargeImage} text={'No analysis available'} />
     } else if (isPending) {
         return <PendingResultPlaceholder isLargeImage={isLargeImage} />
@@ -170,9 +170,9 @@ const AnalysisImageWithPlaceholder = ({
         return <TextAsImage isLargeImage={isLargeImage} text={'No analysis could be found'} />
     } else
         return isLargeImage ? (
-            <StyledInspection $otherContentHeight={'174px'} src={data.visualisedSAS} />
+            <StyledInspection $otherContentHeight={'174px'} src={data.visualizedSAS} />
         ) : (
-            <StyledInspectionImage src={data.visualisedSAS} />
+            <StyledInspectionImage src={data.visualizedSAS} />
         )
 }
 
diff --git a/frontend/src/pages/MissionPage/AnalysisResultView.tsx b/frontend/src/pages/MissionPage/AnalysisResultView.tsx
index a880f1d11..624a29c4d 100644
--- a/frontend/src/pages/MissionPage/AnalysisResultView.tsx
+++ b/frontend/src/pages/MissionPage/AnalysisResultView.tsx
@@ -39,8 +39,8 @@ export const AnalysisResultDialogContent = ({ inspection }: { inspection: Inspec
 
     return (
         <div>
-            {inspection.visualisedSAS ? (
-                <AnalysisImage sasURI={inspection.visualisedSAS} isPending={false} />
+            {inspection.visualizedSAS ? (
+                <AnalysisImage sasURI={inspection.visualizedSAS} isPending={false} />
             ) : (
                 <>{/* No image to display*/}</>
             )}
diff --git a/frontend/src/pages/MissionPage/TaskOverview/TaskTable.tsx b/frontend/src/pages/MissionPage/TaskOverview/TaskTable.tsx
index f26c1fdbe..d08b0c25a 100644
--- a/frontend/src/pages/MissionPage/TaskOverview/TaskTable.tsx
+++ b/frontend/src/pages/MissionPage/TaskOverview/TaskTable.tsx
@@ -110,7 +110,13 @@ const TaskTableRow = ({
             <Table.Cell>
                 <TaskStatusDisplay status={task.status} errorMessage={task.errorDescription} />
             </Table.Cell>
-            <Table.Cell>{inspectionData ? <TaskAnalysisDisplay inspectionData={inspectionData} /> : <></>}</Table.Cell>
+            <Table.Cell>
+                {inspectionData && (inspectionData.visualizedSAS || inspectionData.value) ? (
+                    <TaskAnalysisDisplay inspectionData={inspectionData} />
+                ) : (
+                    <></>
+                )}
+            </Table.Cell>
         </StyledTableRow>
     )
 }
diff --git a/frontend/src/pages/MissionSchedulingComponents/InspectionAreaCards.tsx b/frontend/src/pages/MissionSchedulingComponents/InspectionAreaCards.tsx
index d693c347d..193f342b5 100644
--- a/frontend/src/pages/MissionSchedulingComponents/InspectionAreaCards.tsx
+++ b/frontend/src/pages/MissionSchedulingComponents/InspectionAreaCards.tsx
@@ -1,74 +1,66 @@
 import { InspectionArea } from 'models/InspectionArea'
-import { MissionDefinition } from 'models/MissionDefinition'
-import { InspectionAreaInspectionTuple } from './InspectionSection'
 import { useLanguageContext } from 'components/Contexts/LanguageContext'
 import {
     CardComponent,
     Content,
     InspectionAreaText,
-    Placeholder,
     StyledCard,
     StyledInspectionAreaCard,
-    StyledInspectionAreaCards,
     TopInspectionAreaText,
 } from './InspectionUtilities'
 import { Button, Icon, Tooltip, Typography } from '@equinor/eds-core-react'
 import { Icons } from 'utils/icons'
 import { tokens } from '@equinor/eds-tokens'
-import { useMissionsContext } from 'components/Contexts/MissionRunsContext'
 import { useAssetContext } from 'components/Contexts/AssetContext'
 
 interface InspectionAreaCardProps {
-    inspectionAreaData: InspectionAreaInspectionTuple
+    inspectionArea: InspectionArea
+    nMissions: number
     onClickInspectionArea: (inspectionArea: InspectionArea) => void
-    selectedInspectionArea: InspectionArea | undefined
-    handleScheduleAll: (missionDefinitions: MissionDefinition[]) => void
+    isSelected: boolean
+    isMissionOngoing: boolean
+    onClickScheduleAll: (inspectionArea: InspectionArea) => void
 }
 
-const InspectionAreaCard = ({
-    inspectionAreaData,
+export const InspectionAreaCard = ({
+    inspectionArea,
+    nMissions,
     onClickInspectionArea,
-    selectedInspectionArea,
-    handleScheduleAll,
+    isSelected,
+    isMissionOngoing,
+    onClickScheduleAll,
 }: InspectionAreaCardProps) => {
     const { TranslateText } = useLanguageContext()
-    const { ongoingMissions } = useMissionsContext()
     const { enabledRobots } = useAssetContext()
 
-    const isScheduleMissionsDisabled = enabledRobots.length === 0 || inspectionAreaData.missionDefinitions.length === 0
+    const isScheduleMissionsDisabled = enabledRobots.length === 0 || nMissions === 0
 
     let queueMissionsTooltip = ''
-    if (inspectionAreaData.missionDefinitions.length === 0) queueMissionsTooltip = TranslateText('No available mission')
+    if (nMissions === 0) queueMissionsTooltip = TranslateText('No available mission')
     else if (isScheduleMissionsDisabled) queueMissionsTooltip = TranslateText('No robot available')
 
     return (
-        <StyledInspectionAreaCard key={inspectionAreaData.inspectionArea.inspectionAreaName}>
+        <StyledInspectionAreaCard key={inspectionArea.inspectionAreaName}>
             <StyledCard
-                key={inspectionAreaData.inspectionArea.inspectionAreaName}
-                onClick={() => onClickInspectionArea(inspectionAreaData.inspectionArea)}
-                style={
-                    selectedInspectionArea === inspectionAreaData.inspectionArea
-                        ? { border: `solid ${tokens.colors.interactive.focus.hex} 1px` }
-                        : {}
-                }
+                key={inspectionArea.inspectionAreaName}
+                onClick={() => onClickInspectionArea(inspectionArea)}
+                style={isSelected ? { border: `solid ${tokens.colors.interactive.focus.hex} 1px` } : {}}
             >
                 <InspectionAreaText>
                     <TopInspectionAreaText>
                         <Typography variant={'body_short_bold'}>
-                            {inspectionAreaData.inspectionArea.inspectionAreaName.toString()}
+                            {inspectionArea.inspectionAreaName.toString()}
                         </Typography>
-                        {inspectionAreaData.missionDefinitions
-                            .filter((m) => ongoingMissions.find((om) => om.missionId === m.id))
-                            .map((mission) => (
-                                <Content key={mission.id}>
-                                    <Icon name={Icons.Ongoing} size={16} />
-                                    {TranslateText('InProgress')}
-                                </Content>
-                            ))}
+                        {isMissionOngoing && (
+                            <Content>
+                                <Icon name={Icons.Ongoing} size={16} />
+                                {TranslateText('InProgress')}
+                            </Content>
+                        )}
                     </TopInspectionAreaText>
                     <Typography color={tokens.colors.text.static_icons__secondary.hex}>
-                        {inspectionAreaData.missionDefinitions.length}{' '}
-                        {inspectionAreaData.missionDefinitions.length === 1
+                        {nMissions}{' '}
+                        {nMissions === 1
                             ? TranslateText('Mission').toLowerCase()
                             : TranslateText('Missions').toLowerCase()}
                     </Typography>
@@ -78,13 +70,10 @@ const InspectionAreaCard = ({
                         <Button
                             disabled={isScheduleMissionsDisabled}
                             variant="ghost"
-                            onClick={() => handleScheduleAll(inspectionAreaData.missionDefinitions)}
+                            onClick={() => onClickScheduleAll(inspectionArea)}
                             color="secondary"
                         >
-                            <Icon
-                                name={Icons.Add}
-                                color={inspectionAreaData.missionDefinitions.length > 0 ? '' : 'grey'}
-                            />
+                            <Icon name={Icons.Add} color={nMissions > 0 ? '' : 'grey'} />
                             <Typography color={tokens.colors.text.static_icons__secondary.hex}>
                                 {TranslateText('Queue the missions')}
                             </Typography>
@@ -95,43 +84,3 @@ const InspectionAreaCard = ({
         </StyledInspectionAreaCard>
     )
 }
-
-interface IInspectionAreaCardProps {
-    inspectionAreaMissions: InspectionAreaInspectionTuple[]
-    onClickInspectionArea: (inspectionArea: InspectionArea) => void
-    selectedInspectionArea: InspectionArea | undefined
-    handleScheduleAll: (missionDefinitions: MissionDefinition[]) => void
-}
-
-export const InspectionAreaCards = ({
-    inspectionAreaMissions,
-    onClickInspectionArea,
-    selectedInspectionArea,
-    handleScheduleAll,
-}: IInspectionAreaCardProps) => {
-    const { TranslateText } = useLanguageContext()
-
-    return (
-        <>
-            {Object.keys(inspectionAreaMissions).length > 0 ? (
-                <StyledInspectionAreaCards>
-                    {inspectionAreaMissions.map((inspectionAreaMission) => (
-                        <InspectionAreaCard
-                            key={'inspectionAreaCard' + inspectionAreaMission.inspectionArea.inspectionAreaName}
-                            inspectionAreaData={inspectionAreaMission}
-                            onClickInspectionArea={onClickInspectionArea}
-                            selectedInspectionArea={selectedInspectionArea}
-                            handleScheduleAll={handleScheduleAll}
-                        />
-                    ))}
-                </StyledInspectionAreaCards>
-            ) : (
-                <Placeholder>
-                    <Typography variant="h4" color="disabled">
-                        {TranslateText('No inspections available')}
-                    </Typography>
-                </Placeholder>
-            )}
-        </>
-    )
-}
diff --git a/frontend/src/pages/MissionSchedulingComponents/InspectionSection.tsx b/frontend/src/pages/MissionSchedulingComponents/InspectionSection.tsx
deleted file mode 100644
index 7dc6011e5..000000000
--- a/frontend/src/pages/MissionSchedulingComponents/InspectionSection.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { InspectionArea } from 'models/InspectionArea'
-import { MissionDefinition } from 'models/MissionDefinition'
-
-export interface InspectionAreaInspectionTuple {
-    missionDefinitions: MissionDefinition[]
-    inspectionArea: InspectionArea
-}
diff --git a/frontend/src/pages/MissionSchedulingComponents/InspectionUtilities.tsx b/frontend/src/pages/MissionSchedulingComponents/InspectionUtilities.tsx
index 14716b0a4..155e72025 100644
--- a/frontend/src/pages/MissionSchedulingComponents/InspectionUtilities.tsx
+++ b/frontend/src/pages/MissionSchedulingComponents/InspectionUtilities.tsx
@@ -1,7 +1,6 @@
 import { Card } from '@equinor/eds-core-react'
 import styled from 'styled-components'
 import { MissionDefinition } from 'models/MissionDefinition'
-import { tokens } from '@equinor/eds-tokens'
 import { cardShadow } from 'components/Styles/StyledComponents'
 
 export const StyledCard = styled(Card)`
@@ -52,11 +51,6 @@ export const InspectionAreaOverview = styled.div`
     flex-direction: column;
     gap: 48px;
 `
-export const Placeholder = styled.div`
-    padding: 24px;
-    border: 1px solid ${tokens.colors.ui.background__medium.hex};
-    border-radius: 4px;
-`
 export const Content = styled.div`
     display: flex;
     align-items: centre;
diff --git a/frontend/src/pages/MissionSchedulingComponents/MissionSchedulingTable.tsx b/frontend/src/pages/MissionSchedulingComponents/MissionSchedulingTable.tsx
index 9ddaac1ea..cb673af1f 100644
--- a/frontend/src/pages/MissionSchedulingComponents/MissionSchedulingTable.tsx
+++ b/frontend/src/pages/MissionSchedulingComponents/MissionSchedulingTable.tsx
@@ -8,9 +8,7 @@ import { useNavigate } from 'react-router'
 import { Icons } from 'utils/icons'
 import { compareMissionDefinitions } from './InspectionUtilities'
 import { formatDateTime } from 'utils/StringFormatting'
-import { AlreadyScheduledMissionDialog } from './ScheduleMissionDialogs'
-import { useContext, useState } from 'react'
-import { useMissionsContext } from 'components/Contexts/MissionRunsContext'
+import { useContext } from 'react'
 import { useAssetContext } from 'components/Contexts/AssetContext'
 import { FrontPageSectionId } from 'models/FrontPageSectionId'
 import { SmallScreenInfoText } from 'utils/InfoText'
@@ -74,37 +72,23 @@ const HideColumnsOnSmallScreen = styled.div`
     }
 `
 
-interface IProps {
-    inspectionArea: InspectionArea
-    missionDefinitions: MissionDefinition[]
-    scrollOnToggle: boolean
-    openDialog: () => void
-    setSelectedMissions: (selectedMissions: MissionDefinition[]) => void
-}
-
 interface IMissionRowProps {
     mission: MissionDefinition
-    openDialog: () => void
     setMissions: (selectedMissions: MissionDefinition[]) => void
-    openScheduledDialog: () => void
 }
 
-const MissionRow = ({ mission, openDialog, setMissions, openScheduledDialog }: IMissionRowProps) => {
+const MissionRow = ({ mission, setMissions }: IMissionRowProps) => {
     const { TranslateText } = useLanguageContext()
-    const { missionQueue } = useMissionsContext()
     const { enabledRobots } = useAssetContext()
     const { installation } = useContext(InstallationContext)
     const navigate = useNavigate()
 
-    const isScheduled = missionQueue.map((m) => m.missionId).includes(mission.id)
     const isScheduleButtonDisabled = enabledRobots.length === 0
 
     const lastCompleted = mission.lastSuccessfulRun?.endTime
         ? formatDateTime(mission.lastSuccessfulRun.endTime)
         : TranslateText('Never')
 
-    const noRobotReadyForMissionsText = TranslateText('No robot available')
-
     return (
         <StyledTableRow key={mission.id}>
             <Table.Cell id={Columns.Name}>
@@ -121,55 +105,31 @@ const MissionRow = ({ mission, openDialog, setMissions, openScheduledDialog }: I
             <Table.Cell id={Columns.LastCompleted}>{lastCompleted}</Table.Cell>
             <Table.Cell id={Columns.AddToQueue}>
                 <Centered>
-                    {!isScheduled && (
-                        <Button
-                            style={{ width: isScheduleButtonDisabled ? '110px' : '' }}
-                            variant="ghost_icon"
-                            disabled={isScheduleButtonDisabled}
-                            onClick={() => {
-                                openDialog()
-                                setMissions([mission])
-                            }}
-                        >
-                            <StyledIcon color={`${tokens.colors.interactive.focus.hex}`} name={Icons.Add} size={24} />
-                            {isScheduleButtonDisabled && noRobotReadyForMissionsText}
-                        </Button>
-                    )}
-                    {isScheduled && (
-                        <Button
-                            variant="ghost_icon"
-                            disabled={enabledRobots.length === 0}
-                            onClick={() => {
-                                openScheduledDialog()
-                                setMissions([mission])
-                            }}
-                        >
-                            <StyledIcon color={`${tokens.colors.interactive.focus.hex}`} name={Icons.Add} size={24} />
-                        </Button>
-                    )}
+                    <Button
+                        style={{ width: isScheduleButtonDisabled ? '110px' : '' }}
+                        variant="ghost_icon"
+                        disabled={isScheduleButtonDisabled}
+                        onClick={() => {
+                            setMissions([mission])
+                        }}
+                    >
+                        <StyledIcon color={`${tokens.colors.interactive.focus.hex}`} name={Icons.Add} size={24} />
+                        {isScheduleButtonDisabled && <>{TranslateText('No robot available')}</>}
+                    </Button>
                 </Centered>
             </Table.Cell>
         </StyledTableRow>
     )
 }
 
-export const MissionSchedulingTable = ({
-    inspectionArea,
-    missionDefinitions,
-    openDialog,
-    setSelectedMissions,
-}: IProps) => {
-    const { TranslateText } = useLanguageContext()
-
-    const [isScheduledDialogOpen, setIsScheduledDialogOpen] = useState<boolean>(false)
-
-    const openScheduleDialog = () => {
-        setIsScheduledDialogOpen(true)
-    }
+interface IProps {
+    inspectionArea: InspectionArea
+    missionDefinitions: MissionDefinition[]
+    setSelectedMissions: (selectedMissions: MissionDefinition[]) => void
+}
 
-    const closeScheduleDialog = () => {
-        setIsScheduledDialogOpen(false)
-    }
+export const MissionSchedulingTable = ({ inspectionArea, missionDefinitions, setSelectedMissions }: IProps) => {
+    const { TranslateText } = useLanguageContext()
 
     return (
         <StyledTable id={FrontPageSectionId.InspectionTable}>
@@ -190,20 +150,11 @@ export const MissionSchedulingTable = ({
                     </Table.Head>
                     <Table.Body style={{ backgroundColor: tokens.colors.ui.background__default.hex }}>
                         {missionDefinitions.sort(compareMissionDefinitions).map((mission) => (
-                            <MissionRow
-                                key={mission.id}
-                                mission={mission}
-                                openDialog={openDialog}
-                                setMissions={setSelectedMissions}
-                                openScheduledDialog={openScheduleDialog}
-                            />
+                            <MissionRow key={mission.id} mission={mission} setMissions={setSelectedMissions} />
                         ))}
                     </Table.Body>
                 </Table>
             </HideColumnsOnSmallScreen>
-            {isScheduledDialogOpen && (
-                <AlreadyScheduledMissionDialog openDialog={openDialog} closeDialog={closeScheduleDialog} />
-            )}
         </StyledTable>
     )
 }
diff --git a/frontend/src/pages/MissionSchedulingComponents/ScheduleMissionDialogs.tsx b/frontend/src/pages/MissionSchedulingComponents/ScheduleMissionDialogs.tsx
index 7c6cb1a52..e5adc4d89 100644
--- a/frontend/src/pages/MissionSchedulingComponents/ScheduleMissionDialogs.tsx
+++ b/frontend/src/pages/MissionSchedulingComponents/ScheduleMissionDialogs.tsx
@@ -1,4 +1,4 @@
-import { Autocomplete, Dialog, Typography, Icon } from '@equinor/eds-core-react'
+import { Autocomplete, Typography, Icon } from '@equinor/eds-core-react'
 import styled from 'styled-components'
 import { useLanguageContext } from 'components/Contexts/LanguageContext'
 import { useState } from 'react'
@@ -19,19 +19,6 @@ import {
 import { phone_width } from 'utils/constants'
 import { useBackendApi } from 'api/UseBackendApi'
 
-interface IProps {
-    selectedMissions: MissionDefinition[]
-    closeDialog: () => void
-    setMissions: (selectedMissions: MissionDefinition[] | undefined) => void
-    unscheduledMissions: MissionDefinition[]
-    isAlreadyScheduled: boolean
-}
-
-interface IScheduledProps {
-    openDialog: () => void
-    closeDialog: () => void
-}
-
 const StyledMissionDialog = styled.div`
     display: flex;
     justify-content: space-between;
@@ -59,6 +46,13 @@ const StyledDangerContent = styled.div`
     gap: 2px;
 `
 
+interface IProps {
+    selectedMissions: MissionDefinition[]
+    closeDialog: () => void
+    unscheduledMissions: MissionDefinition[]
+    isAlreadyScheduled: boolean
+}
+
 export const ScheduleMissionDialog = (props: IProps) => {
     const { TranslateText } = useLanguageContext()
     const { enabledRobots } = useAssetContext()
@@ -220,40 +214,3 @@ export const ScheduleMissionDialog = (props: IProps) => {
         </>
     )
 }
-
-export const AlreadyScheduledMissionDialog = (props: IScheduledProps) => {
-    const { TranslateText } = useLanguageContext()
-
-    return (
-        <>
-            <StyledDialog open={true}>
-                <Dialog.Header>{TranslateText('The mission is already in the queue')}</Dialog.Header>
-                <Dialog.CustomContent>
-                    <Typography variant="body_short">{TranslateText('AlreadyScheduledText')}</Typography>
-                </Dialog.CustomContent>
-                <Dialog.Actions>
-                    <StyledMissionSection>
-                        <StyledButton
-                            onClick={() => {
-                                props.closeDialog()
-                            }}
-                            variant="outlined"
-                        >
-                            {' '}
-                            {TranslateText('Cancel')}{' '}
-                        </StyledButton>
-                        <StyledButton
-                            onClick={() => {
-                                props.openDialog()
-                                props.closeDialog()
-                            }}
-                        >
-                            {' '}
-                            {TranslateText('Queue mission')}
-                        </StyledButton>
-                    </StyledMissionSection>
-                </Dialog.Actions>
-            </StyledDialog>
-        </>
-    )
-}
diff --git a/frontend/src/pages/MissionSchedulingPage.tsx b/frontend/src/pages/MissionSchedulingPage.tsx
index 51701f8d8..09757dfac 100644
--- a/frontend/src/pages/MissionSchedulingPage.tsx
+++ b/frontend/src/pages/MissionSchedulingPage.tsx
@@ -10,11 +10,14 @@ import { useMissionDefinitionsContext } from 'components/Contexts/MissionDefinit
 import { useAssetContext } from 'components/Contexts/AssetContext'
 import { PlantPolygonMap } from 'pages/MissionPage/MapPosition/PointillaMapView'
 import { Typography } from '@equinor/eds-core-react'
-import { compareMissionDefinitions, InspectionAreaOverview } from './MissionSchedulingComponents/InspectionUtilities'
-import { InspectionAreaCards } from './MissionSchedulingComponents/InspectionAreaCards'
+import {
+    compareMissionDefinitions,
+    InspectionAreaOverview,
+    StyledInspectionAreaCards,
+} from './MissionSchedulingComponents/InspectionUtilities'
+import { InspectionAreaCard } from './MissionSchedulingComponents/InspectionAreaCards'
 import { MissionSchedulingTable } from './MissionSchedulingComponents/MissionSchedulingTable'
 import { ScheduleMissionDialog } from './MissionSchedulingComponents/ScheduleMissionDialogs'
-import { InspectionAreaInspectionTuple } from './MissionSchedulingComponents/InspectionSection'
 import { StyledPage } from 'components/Styles/StyledComponents'
 import { useLanguageContext } from 'components/Contexts/LanguageContext'
 
@@ -25,25 +28,17 @@ export const MissionSchedulingPage = () => {
     const { ongoingMissions, missionQueue } = useMissionsContext()
     const { installationInspectionAreas } = useAssetContext()
     const { missionDefinitions } = useMissionDefinitionsContext()
-    const [selectedMissions, setSelectedMissions] = useState<MissionDefinition[]>()
-    const [isDialogOpen, setIsDialogOpen] = useState<boolean>(false)
-    const [selectedInspectionArea, setSelectedInspectionArea] = useState<InspectionArea>()
-    const [scrollOnToggle, setScrollOnToggle] = useState<boolean>(true)
+    const [selectedMissions, setSelectedMissions] = useState<MissionDefinition[]>([])
+    const [userSelectedInspectionArea, setSelectedInspectionArea] = useState<InspectionArea | undefined>(undefined)
+    const selectedInspectionArea =
+        userSelectedInspectionArea ??
+        (installationInspectionAreas.length === 1 ? installationInspectionAreas[0] : undefined)
 
-    const inspectionAreaInspections: InspectionAreaInspectionTuple[] =
-        installationInspectionAreas?.map((inspectionArea) => {
-            const missionDefinitionsInInspectionArea = missionDefinitions.filter(
-                (m) => m.inspectionArea.inspectionAreaName === inspectionArea.inspectionAreaName
-            )
-            return {
-                missionDefinitions: missionDefinitionsInInspectionArea,
-                inspectionArea: inspectionArea,
-            }
-        }) ?? []
+    const countMissionsInInspectionArea = (inspectionArea: InspectionArea) =>
+        missionDefinitions.filter((m) => m.inspectionArea.id === inspectionArea.id).length
 
     const onClickInspectionArea = (clickedInspectionArea: InspectionArea) => {
         setSelectedInspectionArea(clickedInspectionArea)
-        setScrollOnToggle(!scrollOnToggle)
     }
 
     const isScheduled = (mission: MissionDefinition) => missionQueue.map((m) => m.missionId).includes(mission.id)
@@ -51,12 +46,11 @@ export const MissionSchedulingPage = () => {
 
     const closeDialog = () => {
         setSelectedMissions([])
-        setIsDialogOpen(false)
     }
 
-    const handleScheduleAll = (missionDefinitions: MissionDefinition[]) => {
-        setIsDialogOpen(true)
-        const sortedMissionDefinitions = missionDefinitions.sort(compareMissionDefinitions)
+    const onClickScheduleAll = (inspectionArea: InspectionArea) => {
+        const relevantMissionDefinitions = missionDefinitions.filter((m) => m.inspectionArea.id === inspectionArea.id)
+        const sortedMissionDefinitions = relevantMissionDefinitions.sort(compareMissionDefinitions)
         setSelectedMissions(sortedMissionDefinitions)
     }
 
@@ -65,12 +59,9 @@ export const MissionSchedulingPage = () => {
 
     const unscheduledMissions = selectedMissions?.filter((m) => !isOngoing(m) && !isScheduled(m))
 
-    const inspectionArea =
-        installationInspectionAreas.length === 1 ? installationInspectionAreas[0] : selectedInspectionArea
-    const selectedAreaMissionDefinitions =
-        inspectionAreaInspections.length === 1
-            ? inspectionAreaInspections[0].missionDefinitions
-            : inspectionAreaInspections.find((d) => d.inspectionArea === inspectionArea)?.missionDefinitions
+    const selectedInspectionAreaMissionDefinitions = selectedInspectionArea
+        ? missionDefinitions.filter((m) => m.inspectionArea.id === selectedInspectionArea.id)
+        : undefined
 
     return (
         <>
@@ -78,46 +69,54 @@ export const MissionSchedulingPage = () => {
             <NavBar />
             <StyledPage>
                 <InspectionAreaOverview>
-                    {installationInspectionAreas.length !== 1 && (
-                        <InspectionAreaCards
-                            inspectionAreaMissions={inspectionAreaInspections}
-                            onClickInspectionArea={onClickInspectionArea}
-                            selectedInspectionArea={selectedInspectionArea}
-                            handleScheduleAll={handleScheduleAll}
-                        />
+                    {installationInspectionAreas.length > 1 && (
+                        <StyledInspectionAreaCards>
+                            {installationInspectionAreas.map((inspectionArea) => (
+                                <InspectionAreaCard
+                                    key={'inspectionAreaCard' + inspectionArea.id}
+                                    inspectionArea={inspectionArea}
+                                    nMissions={countMissionsInInspectionArea(inspectionArea)}
+                                    onClickInspectionArea={onClickInspectionArea}
+                                    isSelected={inspectionArea.id === selectedInspectionArea?.id}
+                                    isMissionOngoing={ongoingMissions.some(
+                                        (m) => m.inspectionArea.id === inspectionArea.id
+                                    )}
+                                    onClickScheduleAll={onClickScheduleAll}
+                                />
+                            ))}
+                        </StyledInspectionAreaCards>
                     )}
-                    {inspectionArea && selectedAreaMissionDefinitions && selectedAreaMissionDefinitions.length > 0 && (
-                        <MissionSchedulingTable
-                            inspectionArea={inspectionArea}
-                            scrollOnToggle={scrollOnToggle}
-                            openDialog={() => setIsDialogOpen(true)}
-                            setSelectedMissions={setSelectedMissions}
-                            missionDefinitions={selectedAreaMissionDefinitions}
-                        />
-                    )}
-                    {inspectionArea &&
-                        selectedAreaMissionDefinitions &&
-                        selectedAreaMissionDefinitions.length === 0 && (
+                    {selectedInspectionArea &&
+                        selectedInspectionAreaMissionDefinitions &&
+                        selectedInspectionAreaMissionDefinitions.length > 0 && (
+                            <MissionSchedulingTable
+                                inspectionArea={selectedInspectionArea}
+                                setSelectedMissions={setSelectedMissions}
+                                missionDefinitions={selectedInspectionAreaMissionDefinitions}
+                            />
+                        )}
+                    {selectedInspectionArea &&
+                        selectedInspectionAreaMissionDefinitions &&
+                        selectedInspectionAreaMissionDefinitions.length === 0 && (
                             <Typography variant="h4" color="disabled">
                                 {TranslateText('No missions defined in this area')}
                             </Typography>
                         )}
-                    {inspectionArea?.plantCode && inspectionArea.areaPolygon?.positions && (
+                    {selectedInspectionArea?.areaPolygon?.positions && (
                         <>
                             {installationInspectionAreas.length === 1 && (
                                 <Typography variant="h3" style={{ marginTop: '10px' }}>
-                                    {inspectionArea?.inspectionAreaName}
+                                    {selectedInspectionArea?.inspectionAreaName}
                                 </Typography>
                             )}
-                            <PlantPolygonMap inspectionArea={inspectionArea} floorId={'0'} />{' '}
+                            <PlantPolygonMap inspectionArea={selectedInspectionArea} floorId={'0'} />{' '}
                         </>
                     )}
                 </InspectionAreaOverview>
-                {isDialogOpen && (
+                {selectedMissions.length > 0 && (
                     <ScheduleMissionDialog
-                        selectedMissions={selectedMissions!}
+                        selectedMissions={selectedMissions}
                         closeDialog={closeDialog}
-                        setMissions={setSelectedMissions}
                         unscheduledMissions={unscheduledMissions!}
                         isAlreadyScheduled={isAlreadyScheduled}
                     />