diff --git a/src/main/webui/public/contextualHelpMessages.jsx b/src/main/webui/public/contextualHelpMessages.jsx
new file mode 100644
index 00000000..fca6f31d
--- /dev/null
+++ b/src/main/webui/public/contextualHelpMessages.jsx
@@ -0,0 +1,151 @@
+export const contextualHelpMessages = [
+     {
+      id: "General-eng",
+      message: " "
+          + " Your own proposals are displayed on the left. You can search for others by title or investigator."
+          + " Create a new proposal by clicking the Create a new proposal button,"
+          + " or upload a new one in a zip file by clicking the Import button."
+          + " To maintain an existing proposal, select it from the list and then choose one of the menu items that appear such as Title, Summary, etc. "
+          + " The Polaris system will capture only sufficient information to allow the TAC to make an informed decision on time allocation for a proposal."
+          + " The detailed requirements will be negotiated once an allocation has been made."
+          + " No viability checks will be made by Polaris, "
+          + " it is the PI's responsibility to ensure that the intended Observatory is capable of performing the observations described in the proposal."
+    }
+, {
+  id: "Overview-eng",
+  message: " "
+          + " An overview of the selected proposal is shown below. You can choose another by clicking its dropdown button in the list."
+          + " You can maintain a component by clicking one of the menuitems, eg Title, Summary, etc."
+}
+, {
+  id: "CreaProp-eng",
+  message: " "
+       + " You must provide a title and a summary."
+       + " Once at least they have been entered, you can save immediately by clicking the Save button following the summary field,"
+       + " and come back later, or cancel and return with the Cancel button."
+       + " Or you can continue with the remaining fields"
+       + " indicating the kind of proposal and providing the scientific and technical justifications."
+       + " You have the option to provide your justification in LaTeX, RST or ASCII format."
+       + " Save your changes with the Save button at bottom right, or cancel and return without saving by clicking the Cancel button."
+}
+, {
+  id: "MaintTitle-eng",
+  message: " Add or edit the title below."
+         + " Save your changes with the Save button at bottom right, or cancel and return without saving by clicking the Cancel button."
+}
+, {
+  id: "MaintSum-eng",
+  message: " Add or edit the summary below."
+         + " Save your changes with the Save button at bottom right, or cancel and return without saving by clicking the Cancel button."
+}
+, {
+  id: "MaintInvestList-eng",
+  message: " "
+       + " Add a new investigator by clicking the Add button at the bottom right of the list."
+       + " Remove an investigator by clicking the Delete button in the same row."
+}
+
+,{
+  id: "MaintInvestAdd-eng",
+  message: " "
+       + " Select a new investigator from the drop-down list."
+       + " They will automatically be assigned as a co-investigator."
+       + " Tick the PhD box if this work forms part of their PhD."
+       + " Save your changes with the Save button at bottom right, or cancel and return without saving by clicking the Cancel button."
+}
+   , {
+  id: "MaintJustList-eng",
+  message: " "
+       + " Click the Edit button next to the scientific or technical justification summary in order to edit it."
+
+}
+   , {
+  id: "MaintSciJust-eng",
+  message: " "
+       + " State briefly the justification for your proposal."
+       + " This must not include details that should be captured elsewhere in Polaris."
+       + " Save your changes with the Save button at bottom right, or cancel and return without saving by clicking the Cancel button."
+}
+
+, {
+  id: "MaintTechJust-eng",
+  message: " "
+      + " State briefly the justification for your proposal."
+      + " This must not include details that should be captured elsewhere in Polaris."
+      + " Save your changes with the Save button at bottom right, or cancel and return without saving by clicking the Cancel button."
+}
+, {
+  id: "MaintTargList-eng",
+  message: " Add a new Target by clicking the Add button at bottom right of the list."
+    + " Remove a Target by clicking the Delete button in its row. (You can't delete a target that is in use.)"
+}
+, {
+  id: "MaintTarg-eng",
+  message: " You must enter a unique target name, its coordinates and their Standard Epoch."
+  + " Alternatively, having entered a known target, you can browse for its details using the Lookup button, "
+  + " which will fill those values for you if the target can be found in Simbad."
+  + " Another possibility, having entered a known target, is to drag the window until the cross-wires are over your desired target."
+  + " Releasing the left-click button will populate the details of that location too."
+  + " Save your changes with the Save button at bottom right, or cancel and return without saving by clicking the Cancel button."
+}
+, {
+  id: "MaintTechGoalList-eng",
+  message: " "
+       + " To add a new technical goal click the Add button at bottom right."
+       + " To edit an existing technical goal click the Edit button in the row,"
+       + " or to remove it click the Delete button."
+       + " You can make a copy of any existing technical goal by clicking its Copy button."
+}
+, {
+  id: "MaintTechGoal-eng",
+  message: " "
+       + " You must provide values and units for the following performance parameters"
+       + " - Angular resolution, Largest scale, Sensitivity, and Spectral point."
+       + " Spectral windows are optional, but if you select one you must enter values and units for"
+       + " Start, End, and Resolution, as well as polarization."
+       + " Save your changes with the Save button at bottom right of the spectral windows, or cancel and return without saving by clicking the Cancel button."
+}
+, {
+  id: "MaintObsFieldList-eng",
+  message: " "
+       + " To add a new observation field click the Add button at bottom right."
+       + " To edit an existing observation field click the Edit button in the row,"
+       + " or to remove it click the Delete button."
+       + " (You can't delete a field that is in use.)"
+}
+, {
+  id: "MaintObsField-eng",
+  message: " Enter a field name and select its type."
+         + " Save your changes with the Save button at bottom right, or cancel and return without saving by clicking the Cancel button."
+}
+, {
+  id: "MaintObsList-eng",
+  message: " "
+       + " To add a new observation click the Add button at bottom right."
+       + " To edit an existing observation click the Edit button in the row,"
+       + " or to remove it click the Delete button."
+       + " You can make a copy of any existing observation by clicking its Copy button."
+}
+, {
+  id: "MaintObs-eng",
+  message: " "
+      + " You must select one Target, and one Technical Goal (Performance parameters), followed by both Observation field and type. "
+      + " If your observation type is Calibration, you must choose Calibration intended use."
+      + " Timing windows are optional, but if you select one, you must provide start and end dates and times"
+      + " (choose the date from the calendar and then select a time from the bottom of the calendar)."
+      + " The slider next to the time fields identifies the window as one to be avoided, and you may add a brief note."
+      + " Save your changes with the Save button at bottom right of the timing windows, or cancel and return without saving by clicking the Cancel button."
+}
+, {
+  id: "ManageDocs-eng",
+  message: " "
+         + " Upload a document by clicking Choose a file, or cancel your request by clicking the Cancel button."
+}
+, {
+  id: "ManageSubmit-eng",
+  message: " "
+         + " Select a cycle and confirm your request with the Submit proposal button at bottom right, or cancel and return without submitting by clicking the Cancel button."
+}
+
+];
+
diff --git a/src/main/webui/src/App2.tsx b/src/main/webui/src/App2.tsx
index a0ca0d8c..cc017a53 100644
--- a/src/main/webui/src/App2.tsx
+++ b/src/main/webui/src/App2.tsx
@@ -49,6 +49,7 @@ import {
 import {useDisclosure} from "@mantine/hooks";
 import AddButton from './commonButtons/add';
 import DatabaseSearchButton from './commonButtons/databaseSearch';
+import {ContextualHelpButton} from "./commonButtons/contextualHelp.tsx"
 import {
     APP_HEADER_HEIGHT, CLOSE_DELAY, ICON_SIZE,
     NAV_BAR_DEFAULT_WIDTH, NAV_BAR_LARGE_WIDTH,
@@ -72,6 +73,7 @@ import CycleTACAddMemberPanel from "./ProposalManagerView/TAC/tacNewMember.tsx"
 import CycleTitlePanel from "./ProposalManagerView/proposalCycle/title.tsx";
 import ObservationFieldsPanel from "./ProposalEditorView/observationFields/ObservationFieldsPanel.tsx";
 import AssignReviewersPanel from "./ProposalManagerView/assignReviewers/AssignReviewersPanel.tsx";
+import ErrorPage from "./errorHandling/error-page.jsx"
 
 /**
  * defines the user context type.
@@ -135,115 +137,142 @@ function App2(): ReactElement {
             {
                 path: "/manager",
                 element: <PSTManager />,
+                    errorElement: <ErrorPage />,
                 children: [
                     {index: true, element: <PSTManagerStart />},
                     {
                         path: "cycle/:selectedCycleCode",
-                        element: <CycleOverviewPanel />
+                        element: <CycleOverviewPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "cycle/:selectedCycleCode/title",
-                        element: <CycleTitlePanel />
+                        element: <CycleTitlePanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "cycle/:selectedCycleCode/tac",
-                        element: <CycleTACPanel />
+                        element: <CycleTACPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "cycle/:selectedCycleCode/tac/new",
-                        element: <CycleTACAddMemberPanel />
+                        element: <CycleTACAddMemberPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "cycle/:selectedCycleCode/dates",
-                        element: <CycleDatesPanel />
+                        element: <CycleDatesPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "cycle/:selectedCycleCode/observingModes",
-                        element: <CycleObservingModesPanel />
+                        element: <CycleObservingModesPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "cycle/:selectedCycleCode/availableResources",
-                        element: <CycleAvailableResourcesPanel />
+                        element: <CycleAvailableResourcesPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "cycle/:selectedCycleCode/reviews",
-                        element: <ReviewsPanel />
+                        element: <ReviewsPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "cycle/:selectedCycleCode/allocations",
-                        element: <AllocationsPanel />
+                        element: <AllocationsPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "cycle/:selectedCycleCode/observatory",
-                        element: <CycleObservatoryPanel />
+                        element: <CycleObservatoryPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "cycle/:selectedCycleCode/assignReviewers",
-                        element: <AssignReviewersPanel />
+                        element: <AssignReviewersPanel />,
+                        errorElement: <ErrorPage />,
                     }
                 ]
             },
             {
                 path: "/",
                 element: <PSTEditor/>,
+                                    errorElement: <ErrorPage />,
                 children: [
                     {index: true, element: <PSTStart/>} ,
                     {
                         path: "admin",
-                        element: <AdminPanel />
+                        element: <AdminPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "proposal/new",
-                        element: <NewProposalPanel />
+                        element: <NewProposalPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "proposal/:selectedProposalCode",
-                        element: <OverviewPanel />
+                        element: <OverviewPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "proposal/:selectedProposalCode/title",
-                        element: <TitlePanel />
+                        element: <TitlePanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "proposal/:selectedProposalCode/summary",
-                        element: <SummaryPanel />
+                        element: <SummaryPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "proposal/:selectedProposalCode/investigators",
-                        element:<InvestigatorsPanel />
+                        element:<InvestigatorsPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path:
                             "proposal/:selectedProposalCode/investigators/new",
-                        element:<AddInvestigatorPanel />
+                        element:<AddInvestigatorPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "proposal/:selectedProposalCode/justifications",
-                        element: <JustificationsPanel />
+                        element: <JustificationsPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "proposal/:selectedProposalCode/targets",
-                        element:<TargetPanel />
+                        element:<TargetPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "proposal/:selectedProposalCode/goals",
-                        element:<TechnicalGoalsPanel />
+                        element:<TechnicalGoalsPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "proposal/:selectedProposalCode/observationFields",
-                        element: <ObservationFieldsPanel />
+                        element: <ObservationFieldsPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "proposal/:selectedProposalCode/observations",
-                        element:<ObservationsPanel />
+                        element:<ObservationsPanel />,
+                        errorElement: <ErrorPage />,
                     },
                     {
                         path: "proposal/:selectedProposalCode/documents",
-                        element:<DocumentsPanel />
+                        element:<DocumentsPanel />,
+                        errorElement: <ErrorPage />,
                     } ,
                     {
                         path: "proposal/:selectedProposalCode/submit",
-                        element:<SubmitPanel />
+                        element:<SubmitPanel />,
+                        errorElement: <ErrorPage />,
                     },
 
                 ]}], {
@@ -354,16 +383,7 @@ function App2(): ReactElement {
                                         label={"Proposals for " + proposalContext.user.fullName}
                                         onClickEvent={handleSearch}
                                     />
-                                    <AddButton toolTipLabel={"new proposal"}
-                                               label={"Create a new proposal"}
-                                               onClickEvent={handleAddNew}/>
-                                    <FileButton onChange={handleUploadZip}
-                                                accept={".zip"}>
-                                        {(props) => <UploadButton
-                                            toolTipLabel="select a file from disk to upload"
-                                            label={"Import"}
-                                            onClick={props.onClick}/>}
-                                    </FileButton>
+
                                 </Group>
                             </Grid.Col>
                             <Grid.Col span={1}>
@@ -406,6 +426,17 @@ function App2(): ReactElement {
                                            pb={"md"}
                                 />
                             </Container>
+
+                        <AddButton toolTipLabel={"new proposal"}
+                            label={"Create a new proposal"}
+                            onClickEvent={handleAddNew}/>
+                        <FileButton onChange={handleUploadZip}
+                            accept={".zip"}>
+                            {(props) => <UploadButton
+                            toolTipLabel="select a file from disk to upload"
+                            label={"Import"}
+                            onClick={props.onClick}/>}
+                            </FileButton>
                         </AppShell.Section>
                         <AppShell.Section component={ScrollArea}>
                             <ProposalListWrapper
@@ -441,15 +472,19 @@ function App2(): ReactElement {
     function PSTStart(): ReactElement {
         return (
             <Container pt={10}>
-
+            <Grid>
                 <Text fz={"lg"} fw={"bold"} c={"teal.7"}>
                     Polaris Landing Page
                 </Text>
-
+                <Grid.Col span={7.5}></Grid.Col>
+                <ContextualHelpButton messageId="General" />
+                <p> &emsp; </p>
+            </Grid>
                 <img src={"/pst/gui/temporary-ufo-landing.png"}
                      alt={"welcome image of a ufo crash landing"}
                      width={"100%"}
                 />
+
             </Container>
         );
     }
diff --git a/src/main/webui/src/ProposalEditorView/investigators/List.tsx b/src/main/webui/src/ProposalEditorView/investigators/List.tsx
index ad991654..090902f8 100644
--- a/src/main/webui/src/ProposalEditorView/investigators/List.tsx
+++ b/src/main/webui/src/ProposalEditorView/investigators/List.tsx
@@ -6,7 +6,7 @@ import {
     useInvestigatorResourceGetInvestigators,
 } from "src/generated/proposalToolComponents.ts";
 import {useQueryClient} from "@tanstack/react-query";
-import {Box, Stack, Table, Text} from "@mantine/core";
+import {Box, Grid, Stack, Table, Text} from "@mantine/core";
 import {modals} from "@mantine/modals";
 import {randomId} from "@mantine/hooks";
 import DeleteButton from "src/commonButtons/delete";
@@ -14,6 +14,7 @@ import AddButton from "src/commonButtons/add";
 import { JSON_SPACES } from 'src/constants.tsx';
 import {EditorPanelHeader, PanelFrame} from "../../commonPanel/appearance.tsx";
 import {notifyError} from "../../commonPanel/notifications.tsx";
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 
 /**
  * the data associated with a given person.
@@ -57,6 +58,7 @@ function InvestigatorsPanel(): ReactElement {
     return (
         <PanelFrame>
             <EditorPanelHeader proposalCode={Number(selectedProposalCode)} panelHeading={"Investigators"}/>
+                <ContextualHelpButton messageId="MaintInvestList" />
                 <Stack>
                     {data?.length === 0 ?
                         <div>Please add an investigator</div>:
@@ -78,9 +80,15 @@ function InvestigatorsPanel(): ReactElement {
                             }
                         </Table.Tbody>
                     </Table>}
-                    <AddButton toolTipLabel={"Add new"}
-                               onClick={handleAddNew} />
+
                 </Stack>
+                <p> </p>
+                <Grid >
+                   <Grid.Col span={10}></Grid.Col>
+                       <AddButton toolTipLabel={"Add new"}
+                            onClick={handleAddNew} />
+                </Grid>
+                <p> </p>
         </PanelFrame>
     );
 }
@@ -92,17 +100,24 @@ function InvestigatorsPanel(): ReactElement {
  * header.
  * @constructor
  */
+
 function InvestigatorsHeader(): ReactElement {
     return (
+        <>
+
         <Table.Thead>
+
             <Table.Tr>
                 <Table.Th>Type</Table.Th>
                 <Table.Th>Name</Table.Th>
                 <Table.Th>eMail</Table.Th>
                 <Table.Th>Institute</Table.Th>
                 <Table.Th></Table.Th>
+
             </Table.Tr>
         </Table.Thead>
+
+        </>
     );
 }
 
diff --git a/src/main/webui/src/ProposalEditorView/investigators/New.tsx b/src/main/webui/src/ProposalEditorView/investigators/New.tsx
index d68431a0..c04bf701 100644
--- a/src/main/webui/src/ProposalEditorView/investigators/New.tsx
+++ b/src/main/webui/src/ProposalEditorView/investigators/New.tsx
@@ -7,7 +7,7 @@ import {
 import {useNavigate, useParams} from "react-router-dom";
 import {useQueryClient} from "@tanstack/react-query";
 import {InvestigatorKind} from "src/generated/proposalToolSchemas.ts";
-import {Checkbox, Select, Stack} from "@mantine/core";
+import {Checkbox, Grid, Select, Stack} from "@mantine/core";
 import {useForm} from "@mantine/form";
 import {FormSubmitButton} from "src/commonButtons/save";
 import DeleteButton from "src/commonButtons/delete";
@@ -15,6 +15,7 @@ import { JSON_SPACES } from 'src/constants.tsx';
 import {EditorPanelHeader, PanelFrame} from "../../commonPanel/appearance.tsx";
 import {notifyError} from "../../commonPanel/notifications.tsx";
 import getErrorMessage from "../../errorHandling/getErrorMessage.tsx";
+import {ContextualHelpButton} from "src/commonButtons/contextualHelp.tsx"
 
 /**
  * Render s form panel to add an investigator to the current proposal.
@@ -108,6 +109,7 @@ function AddInvestigatorPanel(): ReactElement {
     return (
             <PanelFrame>
                 <EditorPanelHeader proposalCode={Number(selectedProposalCode)} panelHeading={"Add an investigator"} />
+                    <ContextualHelpButton  messageId="MaintInvestAdd" />
                 <form onSubmit={handleAdd}>
                     <Stack>
                         <Select label={"Type"}
@@ -124,14 +126,17 @@ function AddInvestigatorPanel(): ReactElement {
                             data={searchData}
                             {...form.getInputProps("selectedInvestigator")}
                         />
-                        <FormSubmitButton
-                            form={form}
-                        />
-                        <DeleteButton
-                            label={"Cancel"}
-                            onClickEvent={handleCancel}
-                            toolTipLabel={"Do not save the new investigator"}/>
                     </Stack>
+                    <p> </p>
+                    <Grid >
+                       <Grid.Col span={8}></Grid.Col>
+                          <FormSubmitButton form={form} />
+                          <DeleteButton
+                             label={"Cancel"}
+                             onClickEvent={handleCancel}
+                             toolTipLabel={"Go back without saving"}/>
+                     </Grid>
+                     <p> </p>
                 </form>
             </PanelFrame>
     )
diff --git a/src/main/webui/src/ProposalEditorView/justifications/JustificationsPanel.tsx b/src/main/webui/src/ProposalEditorView/justifications/JustificationsPanel.tsx
index 0874de72..a46e0af9 100644
--- a/src/main/webui/src/ProposalEditorView/justifications/JustificationsPanel.tsx
+++ b/src/main/webui/src/ProposalEditorView/justifications/JustificationsPanel.tsx
@@ -7,6 +7,7 @@ import {JSON_SPACES} from "src/constants.tsx";
 import {Justification} from "src/generated/proposalToolSchemas.ts";
 import JustificationsTable from "./justifications.table.tsx";
 import {EditorPanelHeader, PanelFrame} from "../../commonPanel/appearance.tsx";
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 
 //no need to use an array, only two "kinds" of Justification 'scientific' and 'technical'
 export type JustificationKinds = {
@@ -50,11 +51,10 @@ export default function JustificationsPanel() : ReactElement {
             </PanelFrame>
         );
     }
-
     return (
         <PanelFrame>
             <EditorPanelHeader proposalCode={Number(selectedProposalCode)} panelHeading={"Justifications"} />
-
+            <ContextualHelpButton messageId="MaintJustList" />
             {scientificIsLoading || technicalIsLoading ? (`Loading justifications...`) :
                 <JustificationsTable scientific={scientific!} technical={technical!} />
             }
diff --git a/src/main/webui/src/ProposalEditorView/justifications/edit.modal.tsx b/src/main/webui/src/ProposalEditorView/justifications/edit.modal.tsx
index b16e6161..4eff5785 100644
--- a/src/main/webui/src/ProposalEditorView/justifications/edit.modal.tsx
+++ b/src/main/webui/src/ProposalEditorView/justifications/edit.modal.tsx
@@ -29,7 +29,11 @@ export default function JustificationsEditModal(justificationProps : Justificati
                 opened={opened}
                 onClose={props.closeModal}
                 title={"View/Edit " + capitalizeFirstChar(props.which) + " Justification"}
-                fullScreen
+                //fullScreen
+                size="auto"
+                height={75}
+                centered
+
             >
                 <JustificationForm {...props} />
             </Modal>
diff --git a/src/main/webui/src/ProposalEditorView/justifications/justification.form.tsx b/src/main/webui/src/ProposalEditorView/justifications/justification.form.tsx
index c84bf460..05e0c091 100644
--- a/src/main/webui/src/ProposalEditorView/justifications/justification.form.tsx
+++ b/src/main/webui/src/ProposalEditorView/justifications/justification.form.tsx
@@ -1,15 +1,17 @@
-import {ReactElement} from "react";
+import {ReactElement, SyntheticEvent} from "react";
 import {Grid, Paper, Select, Stack} from "@mantine/core";
 import {MAX_CHARS_FOR_JUSTIFICATION} from "src/constants.tsx";
 import {JustificationProps} from "./justifications.table.tsx";
 import {Justification, TextFormats} from "src/generated/proposalToolSchemas.ts";
 import {useForm, UseFormReturnType} from "@mantine/form";
 import {fetchProposalResourceUpdateJustification} from "src/generated/proposalToolComponents.ts";
-import {useParams} from "react-router-dom";
+import {useNavigate,useParams } from "react-router-dom";
 import {useQueryClient} from "@tanstack/react-query";
 import {FormSubmitButton} from "src/commonButtons/save.tsx";
+import DeleteButton from "src/commonButtons/delete";
 import {notifyError, notifySuccess} from "../../commonPanel/notifications.tsx";
 import {PreviewJustification} from "./justification.preview.tsx";
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 
 import Editor from "react-simple-code-editor";
 import { languages, highlight } from "prismjs";
@@ -79,6 +81,7 @@ const SelectTextFormat = (form: UseFormReturnType<Justification>) => {
 export default function JustificationForm(props: JustificationProps)
     :ReactElement {
 
+
     const {selectedProposalCode} = useParams();
     const queryClient = useQueryClient();
 
@@ -118,10 +121,19 @@ export default function JustificationForm(props: JustificationProps)
                 notifyError("Update justification error", getErrorMessage(error))
             });
     });
+    const navigate = useNavigate();
+    function handleCancel(event: SyntheticEvent) {
+        event.preventDefault();
+        navigate("../",{relative:"path"})
+        }
 
     return (
         <>
             <form onSubmit={handleSubmit}>
+            {/*}
+            {helpButtonCall}
+            */}
+            <ContextualHelpButton messageId="MaintSciJust" />
             <Stack>
                <Grid span={10} grow>
                     <Grid.Col span={{base: 6, md: 8, lg: 9}}>
@@ -131,8 +143,17 @@ export default function JustificationForm(props: JustificationProps)
                         <SelectTextFormat {...form} />
                     </Grid.Col>
                 </Grid>
-                <FormSubmitButton form={form} />
             </Stack>
+            <p> </p>
+            <Grid>
+              <Grid.Col span={8}></Grid.Col>
+                 <FormSubmitButton form={form} />
+                 <DeleteButton
+                    label={"Cancel"}
+                    onClickEvent={handleCancel}
+                    toolTipLabel={"Go back without saving"}/>
+            </Grid>
+
             </form>
             {form.values.format==='latex' && PreviewJustification(form.values.format!, form.values.text!)}
         </>
diff --git a/src/main/webui/src/ProposalEditorView/observationFields/ObservationFieldsPanel.tsx b/src/main/webui/src/ProposalEditorView/observationFields/ObservationFieldsPanel.tsx
index 82ec7dbd..7deffc67 100644
--- a/src/main/webui/src/ProposalEditorView/observationFields/ObservationFieldsPanel.tsx
+++ b/src/main/webui/src/ProposalEditorView/observationFields/ObservationFieldsPanel.tsx
@@ -5,7 +5,8 @@ import {useProposalResourceGetObservingProposal} from "../../generated/proposalT
 import ObservationFieldsTable from "./observationFieldsTable.tsx";
 import {Field} from "../../generated/proposalToolSchemas.ts";
 import ObservationFieldModal from "./observationFields.modal.tsx";
-import {Badge, Card, Group, Space, Text} from "@mantine/core";
+import {Badge, Card, Grid, Group, Space, Text} from "@mantine/core";
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 
 export type ObservationFieldsProps = {
     observationField: Field | undefined
@@ -44,7 +45,7 @@ export default function ObservationFieldsPanel() : ReactElement {
                 itemName={proposal.data?.title!}
                 panelHeading={"Observation Fields"}
             />
-
+            <ContextualHelpButton messageId="MaintObsFieldList" />
             <Group justify={"center"}>
                 <Card shadow={"sm"} padding={"xs"} radius={"md"} withBorder w={"60%"} m={"lg"}>
                     <Card.Section>
@@ -62,10 +63,15 @@ export default function ObservationFieldsPanel() : ReactElement {
             <ObservationFieldsTable boundFields={boundFields} />
 
             <Space h={"xl"}/>
-
-            <Group justify={'center'}>
+            <Grid>
+              <Grid.Col span={10}></Grid.Col>
+                              <ObservationFieldModal observationField={undefined} />
+                              </Grid>
+              {/*}
+           <Group justify={'center'}>
                 <ObservationFieldModal observationField={undefined} />
             </Group>
+            */}
 
         </PanelFrame>
     )
diff --git a/src/main/webui/src/ProposalEditorView/observationFields/observationFields.form.tsx b/src/main/webui/src/ProposalEditorView/observationFields/observationFields.form.tsx
index 05668e88..3d8babd6 100644
--- a/src/main/webui/src/ProposalEditorView/observationFields/observationFields.form.tsx
+++ b/src/main/webui/src/ProposalEditorView/observationFields/observationFields.form.tsx
@@ -1,6 +1,6 @@
-import {ReactElement} from "react";
+import {ReactElement, SyntheticEvent} from "react";
 import {ObservationFieldsProps} from "./ObservationFieldsPanel.tsx";
-import {Badge, Select, Stack, TextInput, Tooltip} from "@mantine/core";
+import {Badge, Grid, Select, Stack, TextInput, Tooltip} from "@mantine/core";
 import {
     Ellipse,
     EquatorialPoint,
@@ -12,14 +12,16 @@ import {
 } from "../../generated/proposalToolSchemas.ts";
 import {useForm} from "@mantine/form";
 import {SubmitButton} from "../../commonButtons/save.tsx";
+import DeleteButton from "src/commonButtons/delete.tsx";
 import {
     fetchProposalResourceAddNewField,
     fetchProposalResourceChangeFieldName
 } from "../../generated/proposalToolComponents.ts";
-import {useParams} from "react-router-dom";
+import {useParams, useNavigate} from "react-router-dom";
 import {useQueryClient} from "@tanstack/react-query";
 import {notifyError, notifySuccess} from "../../commonPanel/notifications.tsx";
 import getErrorMessage from "../../errorHandling/getErrorMessage.tsx";
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 
 /**
  * Function to return the "Observation Fields" form to either create a new "Field" or edit an existing one.
@@ -173,11 +175,21 @@ export default function ObservationFieldsForm(props: ObservationFieldsProps) : R
                 .catch(error => notifyError("Failed to create new Field", getErrorMessage(error)))
         }
     })
+  const navigate = useNavigate();
 
+  function handleCancel(event: SyntheticEvent) {
+      event.preventDefault();
+      navigate("../",{relative:"path"})
+      }
 
     //Reminder: Once fully implemented remove the type-checking conditions in the Submit disable property
     return (
         <form onSubmit={handleSubmit}>
+                                <p> </p>
+                                <Grid>
+                                  <Grid.Col span={9}></Grid.Col>
+            <ContextualHelpButton messageId="MaintObsField" />
+            </Grid>
             <Stack>
                 {fieldNameTextInput()}
                 {fieldTypeSelect()}
@@ -201,14 +213,24 @@ export default function ObservationFieldsForm(props: ObservationFieldsProps) : R
                         </Badge>
                     </Stack>
                 }
+            </Stack>
+                        <p> </p>
+                        <Grid>
+                          <Grid.Col span={7}></Grid.Col>
+
                 <SubmitButton
                     toolTipLabel={props.observationField ? "Save Changes" : "Save new Field"}
                     label={"Save"}
                     disabled={!form.isDirty() || !form.isValid() ||
                         form.values.fieldType === 'proposal:Ellipse' ||
                         form.values.fieldType === 'proposal:Polygon'}
-                />
-            </Stack>
+                        />
+                 <DeleteButton
+                     label={"Cancel"}
+                     onClickEvent={handleCancel}
+                     toolTipLabel={"Go back without saving"}/>
+                 </Grid>
+
         </form>
     )
 }
\ No newline at end of file
diff --git a/src/main/webui/src/ProposalEditorView/observations/edit.group.tsx b/src/main/webui/src/ProposalEditorView/observations/edit.group.tsx
index 7c8f9909..bf38ead8 100644
--- a/src/main/webui/src/ProposalEditorView/observations/edit.group.tsx
+++ b/src/main/webui/src/ProposalEditorView/observations/edit.group.tsx
@@ -1,7 +1,7 @@
 import TargetTypeForm from "./targetType.form.tsx";
 import TimingWindowsForm from "./timingWindows.form.tsx";
 import {ObservationProps} from "./observationPanel.tsx";
-import { Fieldset, Grid, Text, Stack, Space } from '@mantine/core';
+import { Fieldset, Grid, Text, Stack} from '@mantine/core';
 import {
     CalibrationObservation,
     CalibrationTargetIntendedUse, Observation, Target, TargetObservation,
@@ -15,10 +15,12 @@ import {
     fetchObservationResourceReplaceTimingWindow
 } from 'src/generated/proposalToolComponents.ts';
 import {FormSubmitButton} from 'src/commonButtons/save.tsx';
-import { useParams } from 'react-router-dom';
+import DeleteButton from 'src/commonButtons/delete.tsx';
+import { useNavigate, useParams } from 'react-router-dom';
 import { useQueryClient } from '@tanstack/react-query';
-import { FormEvent, ReactElement } from 'react';
+import { FormEvent, ReactElement, SyntheticEvent } from 'react';
 import { TimingWindowGui } from './timingWindowGui.tsx';
+import {ContextualHelpButton} from "src/commonButtons/contextualHelp.tsx"
 
 /**
  * the different types of observation.
@@ -275,9 +277,16 @@ export default function ObservationEditGroup(
             }
     });
 
+  const navigate = useNavigate();
+
+  function handleCancel(event: SyntheticEvent) {
+      event.preventDefault();
+      navigate("../",{relative:"path"})
+      }
     return (
         <>
             <form onSubmit={handleSubmit}>
+            <ContextualHelpButton messageId="MaintObs" />
             <Stack>
                 <Grid  columns={5}>
                     <Grid.Col span={{base: 5, lg: 2}}>
@@ -292,11 +301,23 @@ export default function ObservationEditGroup(
                             </Text>
                             <TimingWindowsForm {...form}/>
                         </Fieldset>
+
+
+                                    <p> </p>
+                                    <Grid>
+                                      <Grid.Col span={7}></Grid.Col>
+                                         <FormSubmitButton form={form} />
+                                         <DeleteButton
+                                            label={"Cancel"}
+                                            onClickEvent={handleCancel}
+                                            toolTipLabel={"Go back without saving"}/>
+                                    </Grid>
+                                    <p> </p>
+
                     </Grid.Col>
                 </Grid>
-                <FormSubmitButton form={form} />
-                <Space />
                 </Stack>
+
             </form>
         </>
     )
diff --git a/src/main/webui/src/ProposalEditorView/observations/edit.modal.tsx b/src/main/webui/src/ProposalEditorView/observations/edit.modal.tsx
index 4bfa95d0..9d6be505 100644
--- a/src/main/webui/src/ProposalEditorView/observations/edit.modal.tsx
+++ b/src/main/webui/src/ProposalEditorView/observations/edit.modal.tsx
@@ -46,7 +46,7 @@ export default function ObservationEditModal(
                     title={newObservation ?
                         "New Observation" :
                         "View/Edit Observation"}
-                    fullScreen
+                    size = "auto" //fullScreen
                 >
                     <ObservationEditGroup {...props}/>
                 </Modal>
diff --git a/src/main/webui/src/ProposalEditorView/observations/observationPanel.tsx b/src/main/webui/src/ProposalEditorView/observations/observationPanel.tsx
index 8bac2dd6..c5753fdc 100644
--- a/src/main/webui/src/ProposalEditorView/observations/observationPanel.tsx
+++ b/src/main/webui/src/ProposalEditorView/observations/observationPanel.tsx
@@ -3,12 +3,13 @@ import {
 } from 'src/generated/proposalToolComponents';
 import {useParams} from "react-router-dom";
 import ObservationRow, { observationTableHeader } from './observationTable.tsx';
-import {Container, Group, List, Space, Table} from "@mantine/core";
+import {Container, Grid, Group, List, Space, Table} from "@mantine/core";
 import {Observation} from "src/generated/proposalToolSchemas.ts";
 import getErrorMessage from "src/errorHandling/getErrorMessage.tsx";
 import { ReactElement } from 'react';
 import ObservationEditModal from './edit.modal.tsx';
 import NavigationButton from 'src/commonButtons/navigation.tsx';
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 import {IconTarget, IconChartLine, IconGeometry} from '@tabler/icons-react';
 import {PanelFrame, PanelHeader} from "../../commonPanel/appearance.tsx";
 
@@ -192,11 +193,17 @@ function Observations() {
         return (
             <PanelFrame>
                 <Header/>
+                <Grid>
+                   <Grid.Col span={10}></Grid.Col>
+                   <ContextualHelpButton messageId="MaintObsList" />
+                </Grid>
+
                 <TableGenerator/>
                 <Space h={"xl"}/>
-                <Group justify={'center'}>
+                <Grid>
+                   <Grid.Col span={10}></Grid.Col>
                     <ObservationEditModal observation={undefined}/>
-                </Group>
+                </Grid>
             </PanelFrame>
         )
     }
diff --git a/src/main/webui/src/ProposalEditorView/proposal/Documents.tsx b/src/main/webui/src/ProposalEditorView/proposal/Documents.tsx
index 0f7d0e06..5b4f8264 100644
--- a/src/main/webui/src/ProposalEditorView/proposal/Documents.tsx
+++ b/src/main/webui/src/ProposalEditorView/proposal/Documents.tsx
@@ -4,9 +4,9 @@ import {
     fetchSupportingDocumentResourceUploadSupportingDocument,
     useSupportingDocumentResourceGetSupportingDocuments
 } from "src/generated/proposalToolComponents";
-import {useParams} from "react-router-dom";
-import {Box, FileButton, Stack, Table, Text} from "@mantine/core";
-import {useState} from "react";
+import {useNavigate, useParams} from "react-router-dom";
+import {Box, FileButton, Grid, Stack, Table, Text} from "@mantine/core";
+import {SyntheticEvent, useState} from "react";
 import {useQueryClient} from "@tanstack/react-query";
 import {modals} from "@mantine/modals";
 import {randomId} from "@mantine/hooks";
@@ -20,6 +20,7 @@ import {HEADER_FONT_WEIGHT, JSON_SPACES, MAX_SUPPORTING_DOCUMENT_SIZE} from 'src
 import {EditorPanelHeader, PanelFrame} from "../../commonPanel/appearance.tsx";
 import {notifyError, notifySuccess} from "../../commonPanel/notifications.tsx";
 import getErrorMessage from "../../errorHandling/getErrorMessage.tsx";
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 
 type DocumentProps = {
     dbid: number,
@@ -80,10 +81,16 @@ const DocumentsPanel = () => {
             }
         }
     };
+  const navigate = useNavigate();
 
+  function handleCancel(event: SyntheticEvent) {
+      event.preventDefault();
+      navigate("../",{relative:"path"})
+      }
     return (
         <PanelFrame>
             <EditorPanelHeader proposalCode={Number(selectedProposalCode)} panelHeading={"Documents"} />
+            <ContextualHelpButton messageId="ManageDocs" />
             <Stack>
                 <Table>
                     <Table.Tbody>
@@ -108,12 +115,20 @@ const DocumentsPanel = () => {
                 </Table>
 
                 <Text fz="lg" fw={HEADER_FONT_WEIGHT}>Upload a document</Text>
+                            <p> </p>
+                            <Grid>
+                              <Grid.Col span={8}></Grid.Col>
                 <FileButton onChange={handleUpload}>
                             {(props) => <UploadButton
                                 toolTipLabel="select a file from disk to upload"
                                 label={"Choose a file"}
                                 onClick={props.onClick}/>}
                 </FileButton>
+                                 <DeleteButton
+                                    label={"Cancel"}
+                                    onClickEvent={handleCancel}
+                                    toolTipLabel={"Go back without saving"}/>
+                                    </Grid>
                 <Result status={status} />
             </Stack>
         </PanelFrame>
diff --git a/src/main/webui/src/ProposalEditorView/proposal/New.tsx b/src/main/webui/src/ProposalEditorView/proposal/New.tsx
index 64524f50..81f95fe1 100644
--- a/src/main/webui/src/ProposalEditorView/proposal/New.tsx
+++ b/src/main/webui/src/ProposalEditorView/proposal/New.tsx
@@ -1,4 +1,4 @@
-import { useContext, useState } from "react";
+import { SyntheticEvent, useContext, useState } from "react";
 import {ProposalContext} from 'src/App2'
 import {
     fetchProposalResourceAddNewField,
@@ -12,15 +12,17 @@ import {
     TargetField
 } from "src/generated/proposalToolSchemas";
 import {useNavigate} from "react-router-dom";
-import {Box, Container, Select, Text, Textarea, TextInput, Stack, Space} from "@mantine/core";
+import {Box, Container, Grid, Select, Text, Textarea, TextInput, Stack, Space} from "@mantine/core";
 import {useForm} from "@mantine/form";
 import {useQueryClient} from "@tanstack/react-query";
 import {FormSubmitButton} from 'src/commonButtons/save';
+import DeleteButton from 'src/commonButtons/delete';
 import { MAX_CHARS_FOR_INPUTS, TEXTAREA_MAX_ROWS } from "src/constants";
 import MaxCharsForInputRemaining from "src/commonInputs/remainingCharacterCount.tsx";
 import {PanelFrame, PanelHeader} from "../../commonPanel/appearance.tsx";
 import {notifyError} from "../../commonPanel/notifications.tsx";
 import getErrorMessage from "../../errorHandling/getErrorMessage.tsx";
+import {ContextualHelpButton} from "src/commonButtons/contextualHelp.tsx"
 
 
 const kindData = [
@@ -101,6 +103,11 @@ const textFormatData = [
             });
     });
 
+
+  function handleCancel(event: SyntheticEvent) {
+      event.preventDefault();
+      navigate("../",{relative:"path"})
+      }
      return (
         <PanelFrame>
             <PanelHeader itemName={"NEW"} panelHeading={"Create Proposal"} />
@@ -109,6 +116,7 @@ const textFormatData = [
             }
             <form onSubmit={createNewObservingProposal}>
                 <Container fluid>
+                 <ContextualHelpButton messageId="CreaProp" />
                 <Stack>
                     <TextInput name="title"
                         maxLength={MAX_CHARS_FOR_INPUTS}
@@ -131,9 +139,15 @@ const textFormatData = [
                     <MaxCharsForInputRemaining
                         length={form.values.summary.length}
                     />
-                    <FormSubmitButton
-                         form={form}
-                     />
+            <p> </p>
+            <Grid>
+              <Grid.Col span={8}></Grid.Col>
+                 <FormSubmitButton form={form} />
+                 <DeleteButton
+                    label={"Cancel"}
+                    onClickEvent={handleCancel}
+                    toolTipLabel={"Go back without saving"}/>
+            </Grid>
                     <Space />
 
                     <Select label={"Kind"}
@@ -177,10 +191,15 @@ const textFormatData = [
                         pt={"sm"} pb={"lg"}
                         {...form.getInputProps('technicalJustification.format')}
                     />
-                <FormSubmitButton
-                    form={form}
-                    label={"Save"}
-                />
+            <p> </p>
+            <Grid>
+              <Grid.Col span={8}></Grid.Col>
+                 <FormSubmitButton form={form} />
+                 <DeleteButton
+                    label={"Cancel"}
+                    onClickEvent={handleCancel}
+                    toolTipLabel={"Go back without saving"}/>
+            </Grid>
                 <Space />
                 </Stack>
                 </Container>
diff --git a/src/main/webui/src/ProposalEditorView/proposal/Overview.tsx b/src/main/webui/src/ProposalEditorView/proposal/Overview.tsx
index 774c7405..5de7d135 100644
--- a/src/main/webui/src/ProposalEditorView/proposal/Overview.tsx
+++ b/src/main/webui/src/ProposalEditorView/proposal/Overview.tsx
@@ -27,6 +27,7 @@ import { DIMMED_FONT_WEIGHT, JSON_SPACES } from 'src/constants.tsx';
 import { TargetTable } from '../targets/TargetTable.tsx';
 import { TechnicalGoalsTable } from '../technicalGoals/technicalGoalTable.tsx';
 import {PreviewJustification} from "../justifications/justification.preview.tsx";
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 
 /*
       title    -- string
@@ -562,6 +563,7 @@ function OverviewPanel(): ReactElement {
                         <DownloadButton/>
                         <div ref={printRef}>
                             <DisplayTitle/>
+                            <ContextualHelpButton messageId="Overview" />
                             <DisplayInvestigators/>
                             <DisplaySummary/>
                             <DisplayKind/>
diff --git a/src/main/webui/src/ProposalEditorView/proposal/Submit.tsx b/src/main/webui/src/ProposalEditorView/proposal/Submit.tsx
index 1866cb9c..3a40f164 100644
--- a/src/main/webui/src/ProposalEditorView/proposal/Submit.tsx
+++ b/src/main/webui/src/ProposalEditorView/proposal/Submit.tsx
@@ -1,5 +1,5 @@
-import {ReactElement, useEffect, useState} from "react";
-import {Box, Select, Stack, Text} from "@mantine/core";
+import {ReactElement, SyntheticEvent, useEffect, useState} from "react";
+import {Box, Grid, Select, Stack, Text} from "@mantine/core";
 import {
     fetchProposalCyclesResourceGetProposalCycleDates,
     fetchSubmittedProposalResourceSubmitProposal,
@@ -10,11 +10,13 @@ import {useNavigate, useParams} from "react-router-dom";
 import {useForm} from "@mantine/form";
 import {JSON_SPACES} from "src/constants.tsx";
 import {SubmitButton} from "src/commonButtons/save.tsx";
+import DeleteButton from "src/commonButtons/delete.tsx";
 import {useQueryClient} from "@tanstack/react-query";
 import ValidationOverview from "./ValidationOverview.tsx";
 import {EditorPanelHeader, PanelFrame} from "../../commonPanel/appearance.tsx";
 import {notifyError, notifySuccess} from "../../commonPanel/notifications.tsx";
 import getErrorMessage from "../../errorHandling/getErrorMessage.tsx";
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 
 function SubmitPanel(): ReactElement {
     const {selectedProposalCode} = useParams();
@@ -80,6 +82,10 @@ function SubmitPanel(): ReactElement {
             .catch((error) => notifyError("Submission failed", getErrorMessage(error))
             )
     });
+  function handleCancel(event: SyntheticEvent) {
+      event.preventDefault();
+      navigate("../",{relative:"path"})
+      }
 
     return (
         <PanelFrame>
@@ -88,19 +94,31 @@ function SubmitPanel(): ReactElement {
             <ValidationOverview cycle={selectedCycle}/>
 
             <form onSubmit={trySubmitProposal}>
+                <ContextualHelpButton messageId="ManageSubmit" />
                 <Stack>
                     <Select label={"Cycle"}
                         data={searchData}
                         {...form.getInputProps("selectedCycle")}
                         onChange={changeCycleDates}
                     />
+
                     <Text>Submission deadline {submissionDeadline}</Text>
+                </Stack>
+
+                <p> </p>
+                <Grid>
+                    <Grid.Col span={7}></Grid.Col>
                     <SubmitButton
                         disabled={form.values.selectedCycle===0}
                         label={"Submit proposal"}
                         toolTipLabel={"Submit your proposal to the selected cycle"}
                     />
-                </Stack>
+                    <DeleteButton
+                        label={"Cancel"}
+                        onClickEvent={handleCancel}
+                        toolTipLabel={"Go back without submitting"}/>
+                </Grid>
+
             </form>
         </PanelFrame>
     )
diff --git a/src/main/webui/src/ProposalEditorView/proposal/Summary.tsx b/src/main/webui/src/ProposalEditorView/proposal/Summary.tsx
index 2757805e..a65c8fc6 100644
--- a/src/main/webui/src/ProposalEditorView/proposal/Summary.tsx
+++ b/src/main/webui/src/ProposalEditorView/proposal/Summary.tsx
@@ -1,14 +1,15 @@
-import {useState, useEffect} from "react";
+import {SyntheticEvent, useState, useEffect} from "react";
 import {
     fetchProposalResourceReplaceSummary,
     ProposalResourceReplaceSummaryVariables,
     useProposalResourceGetObservingProposal,
 } from "src/generated/proposalToolComponents";
 import {useMutation, useQueryClient} from "@tanstack/react-query";
-import {useParams} from "react-router-dom";
-import {Box, Stack, Textarea} from "@mantine/core";
+import {useNavigate, useParams} from "react-router-dom";
+import {Box, Grid, Stack, Textarea} from "@mantine/core";
 import {useForm} from "@mantine/form";
 import {FormSubmitButton} from 'src/commonButtons/save';
+import DeleteButton from "src/commonButtons/delete";
 import {
     JSON_SPACES,
     MAX_CHARS_FOR_INPUTS, TEXTAREA_MAX_ROWS
@@ -17,6 +18,7 @@ import MaxCharsForInputRemaining from "src/commonInputs/remainingCharacterCount.
 import {PanelFrame, PanelHeader} from "../../commonPanel/appearance.tsx";
 import {notifyError, notifySuccess} from "../../commonPanel/notifications.tsx";
 import getErrorMessage from "../../errorHandling/getErrorMessage.tsx";
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 
 function SummaryPanel() {
     const { selectedProposalCode } = useParams();
@@ -37,6 +39,12 @@ function SummaryPanel() {
     // get client for talking to database.
     const queryClient = useQueryClient()
 
+    const navigate = useNavigate();
+    function handleCancel(event: SyntheticEvent) {
+       event.preventDefault();
+       navigate("../",{relative:"path"})
+       }
+
     const mutation = useMutation({
             mutationFn: () => {
                 const newSummary: ProposalResourceReplaceSummaryVariables = {
@@ -84,7 +92,6 @@ function SummaryPanel() {
         setSummary(val.summary);
         mutation.mutate();
     });
-
     return (
         <PanelFrame>
             <PanelHeader isLoading={isLoading} itemName={data?.title as string} panelHeading={"Summary"} />
@@ -93,13 +100,23 @@ function SummaryPanel() {
                 <Box>Submitting request</Box> :
 
             <form onSubmit={updateSummary}>
+                    <ContextualHelpButton messageId="MaintSum" />
                 <Stack>
                     <Textarea rows={TEXTAREA_MAX_ROWS}
                               maxLength={MAX_CHARS_FOR_INPUTS}
                               name="summary" {...form.getInputProps('summary')} />
                     <MaxCharsForInputRemaining length={form.values.summary.length} />
-                    <FormSubmitButton form={form} />
                 </Stack>
+                <p> </p>
+                <Grid >
+                   <Grid.Col span={8}></Grid.Col>
+                       <FormSubmitButton form={form} />
+                       <DeleteButton
+                           label={"Cancel"}
+                            onClickEvent={handleCancel}
+                            toolTipLabel={"Go back without saving"}/>
+                </Grid>
+                <p> </p>
             </form>
             }
         </PanelFrame>
diff --git a/src/main/webui/src/ProposalEditorView/proposal/Title.tsx b/src/main/webui/src/ProposalEditorView/proposal/Title.tsx
index 580bddc6..2e3551c5 100644
--- a/src/main/webui/src/ProposalEditorView/proposal/Title.tsx
+++ b/src/main/webui/src/ProposalEditorView/proposal/Title.tsx
@@ -1,19 +1,21 @@
-import {useState, useEffect} from "react";
+import {SyntheticEvent, useState, useEffect} from "react";
 import {
     fetchProposalResourceReplaceTitle,
     ProposalResourceReplaceTitleVariables,
     useProposalResourceGetObservingProposalTitle,
 } from "src/generated/proposalToolComponents";
 import {useMutation, useQueryClient} from "@tanstack/react-query";
-import {Stack, TextInput} from "@mantine/core";
-import {useParams} from "react-router-dom";
+import {Grid, Stack, TextInput} from "@mantine/core";
+import {useNavigate, useParams} from "react-router-dom";
 import {useForm} from "@mantine/form";
 import {FormSubmitButton} from 'src/commonButtons/save';
+import DeleteButton from "src/commonButtons/delete";
 import { MAX_CHARS_FOR_INPUTS, JSON_SPACES } from 'src/constants';
 import MaxCharsForInputRemaining from "src/commonInputs/remainingCharacterCount.tsx";
 import {PanelFrame, PanelHeader} from "../../commonPanel/appearance.tsx";
 import {notifyError, notifySuccess} from "../../commonPanel/notifications.tsx";
 import getErrorMessage from "../../errorHandling/getErrorMessage.tsx";
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 
 const titleFormJSON =  {
     initialValues: {title: "Loading..."},
@@ -86,24 +88,40 @@ function TitlePanel() {
         mutation.mutate();
     });
 
+    const navigate = useNavigate();
+
+    function handleCancel(event: SyntheticEvent) {
+        event.preventDefault();
+        navigate("../",{relative:"path"})
+        }
+
     return (
         <PanelFrame>
             <PanelHeader isLoading={isLoading} itemName={data as unknown as string} panelHeading={"Title"} />
             { isLoading ? ("Loading..") :
                  submitting ? ("Submitting..."):
             <form onSubmit={updateTitle}>
+                    <ContextualHelpButton messageId="MaintTitle" />
                 <Stack>
                     <TextInput name="title"
                                maxLength={MAX_CHARS_FOR_INPUTS}
                                {...form.getInputProps('title')}/>
                     <MaxCharsForInputRemaining length={form.values.title.length} />
-                    <FormSubmitButton form={form} />
                 </Stack>
+                <p> </p>
+                <Grid >
+                   <Grid.Col span={8}></Grid.Col>
+                      <FormSubmitButton form={form} />
+                      <DeleteButton
+                          label={"Cancel"}
+                          onClickEvent={handleCancel}
+                          toolTipLabel={"Go back without saving"}/>
+                </Grid>
+                <p> </p>
             </form>
             }
         </PanelFrame>
     );
-
 }
 
 export default TitlePanel
\ No newline at end of file
diff --git a/src/main/webui/src/ProposalEditorView/targets/New.tsx b/src/main/webui/src/ProposalEditorView/targets/New.tsx
index bd6580e8..42e3d787 100644
--- a/src/main/webui/src/ProposalEditorView/targets/New.tsx
+++ b/src/main/webui/src/ProposalEditorView/targets/New.tsx
@@ -6,6 +6,7 @@ import {
     MouseEvent,
     ReactElement,
     ReactNode,
+    SyntheticEvent,
     useEffect,
     useRef, useState
 } from 'react';
@@ -18,10 +19,12 @@ import {
     fetchSimbadResourceSimbadFindTarget, fetchSpaceSystemResourceGetSpaceSystem
 } from "src/generated/proposalToolComponents.ts";
 import {useQueryClient} from "@tanstack/react-query";
-import {useParams} from "react-router-dom";
+import {useNavigate, useParams} from "react-router-dom";
 import AddButton from 'src/commonButtons/add';
+import DeleteButton from 'src/commonButtons/delete.tsx';
 import DatabaseSearchButton from 'src/commonButtons/databaseSearch';
 import { SubmitButton } from 'src/commonButtons/save';
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 import { useHistoryState } from 'src/useHistoryState.ts';
 import "./aladin.css";
 import {
@@ -287,8 +290,21 @@ const TargetForm = (props: FormPropsType<newTargetData>): ReactElement => {
         Aladin.gotoRaDec(form.values.RA, value as number);
     }
 
+    /**
+    * manage the cancel button
+     */
+  const navigate = useNavigate();
+
+  function handleCancel(event: SyntheticEvent) {
+      event.preventDefault();
+      navigate("../",{relative:"path"})
+      }
+
+
     // return the dynamic HTML.
     return (
+        <>
+        <ContextualHelpButton messageId="MaintTarg" />
         <Grid columns={4}>
             <Grid.Col span={2}>
                 <div id="aladin-lite-div"
@@ -357,15 +373,23 @@ const TargetForm = (props: FormPropsType<newTargetData>): ReactElement => {
                                     form.getInputProps("Dec").onChange(e);
                                 }}}
                         />
-                        <SubmitButton
-                            toolTipLabel={"Save this target"}
-                            disabled={!form.isValid() ||
-                                      form.values.searching? true : undefined}
-                        />
+                        <p> </p>
                     </Stack>
+                    <Grid>
+                       <Grid.Col span={8}></Grid.Col>
+                       <SubmitButton
+                           toolTipLabel={"Save this target"}
+                           disabled={!form.isValid() ||
+                           form.values.searching? true : undefined}/>
+                       <DeleteButton
+                           label={"Cancel"}
+                           onClickEvent={handleCancel}
+                           toolTipLabel={"Go back without saving"}/>
+                    </Grid>
                 </form>
             </Grid.Col>
         </Grid>
+        </>
     );
 };
 
diff --git a/src/main/webui/src/ProposalEditorView/targets/targetPanel.tsx b/src/main/webui/src/ProposalEditorView/targets/targetPanel.tsx
index bbb91c15..55d2aa81 100644
--- a/src/main/webui/src/ProposalEditorView/targets/targetPanel.tsx
+++ b/src/main/webui/src/ProposalEditorView/targets/targetPanel.tsx
@@ -5,11 +5,12 @@ import {
 
 import AddTargetModal from "./New";
 import {useParams} from "react-router-dom";
-import {Box, Stack} from '@mantine/core';
+import {Grid, Box, Stack} from '@mantine/core';
 import { ReactElement } from 'react';
 import { JSON_SPACES } from 'src/constants.tsx';
 import { TargetTable } from './TargetTable.tsx';
 import {EditorPanelHeader, PanelFrame} from "../../commonPanel/appearance.tsx";
+import {ContextualHelpButton} from "src/commonButtons/contextualHelp.tsx"
 
 /**
  * Renders the target panel containing an add target button
@@ -51,6 +52,7 @@ export function TargetPanel(): ReactElement {
     return (
         <PanelFrame>
             <EditorPanelHeader proposalCode={Number(selectedProposalCode)} panelHeading={"Targets"} />
+            <ContextualHelpButton  messageId="MaintTargList" />
             <Stack>
                 {data?.length === 0?
                     <div>Please add your targets</div> :
@@ -61,8 +63,14 @@ export function TargetPanel(): ReactElement {
                                  showButtons={true}
                                  selectedTargets={undefined}/>
                 }
-                <AddTargetModal/>
+
             </Stack>
+                        <p> </p>
+                        <Grid>
+                          <Grid.Col span={10}></Grid.Col>
+                                          <AddTargetModal/>
+                                          </Grid>
+                                          <p> </p>
         </PanelFrame>
     );
 }
\ No newline at end of file
diff --git a/src/main/webui/src/ProposalEditorView/technicalGoals/edit.group.tsx b/src/main/webui/src/ProposalEditorView/technicalGoals/edit.group.tsx
index 7692e346..9fe3915d 100644
--- a/src/main/webui/src/ProposalEditorView/technicalGoals/edit.group.tsx
+++ b/src/main/webui/src/ProposalEditorView/technicalGoals/edit.group.tsx
@@ -1,9 +1,9 @@
 import PerformanceParametersSection from "./performance.form.tsx";
 import SpectralWindowsSection from "./spectrum.form.tsx";
-import {Grid, Stack, Space} from "@mantine/core";
+import {Grid, Stack} from "@mantine/core";
 import {TechnicalGoalProps} from "./technicalGoalsPanel.tsx";
-import { ReactElement } from 'react';
-import {useParams} from "react-router-dom";
+import { ReactElement, SyntheticEvent } from 'react';
+import {useParams, useNavigate} from "react-router-dom";
 import {useQueryClient} from "@tanstack/react-query";
 import {
     convertToScienceSpectralWindow,
@@ -18,12 +18,14 @@ import {
     fetchTechnicalGoalResourceReplacePerformanceParameters, fetchTechnicalGoalResourceReplaceSpectrum
 } from "src/generated/proposalToolComponents.ts";
 import {FormSubmitButton} from "src/commonButtons/save.tsx";
+import DeleteButton from "src/commonButtons/delete.tsx";
 import {
     convertToPerformanceParameters,
     convertToPerformanceParametersGui,
     PerformanceParametersGui
 } from "./performanceParametersGui.tsx";
 import {notifySuccess} from "../../commonPanel/notifications.tsx";
+import {ContextualHelpButton} from "src/commonButtons/contextualHelp.tsx"
 
 export const notSpecified = "not specified";
 export const notSet = "not set";
@@ -262,25 +264,35 @@ export default function TechnicalGoalEditGroup(
             }
         }
     })
+    const navigate = useNavigate();
+    function handleCancel(event: SyntheticEvent) {
+        event.preventDefault();
+        navigate("../",{relative:"path"})
+        }
 
     return (
         <form onSubmit={handleSubmit}>
+            <ContextualHelpButton messageId="MaintTechGoal" />
         <Stack>
-
             <Grid columns={TOTAL_COLUMNS}>
                 <Grid.Col span={{base: TOTAL_COLUMNS, md: PERFORMANCE_COLUMNS}}>
                     <PerformanceParametersSection {...form}/>
                 </Grid.Col>
                 <Grid.Col span={{base: TOTAL_COLUMNS, md: SPECTRUM_COLUMNS}}>
                     <SpectralWindowsSection {...form}/>
+                    <p> </p>
+                    <Grid>
+                    <Grid.Col span={8}></Grid.Col>
+                       <FormSubmitButton form={form} />
+                       <DeleteButton
+                          label={"Cancel"}
+                          onClickEvent={handleCancel}
+                           toolTipLabel={"Go back without saving"}/>
+                     </Grid>
+                     <p> </p>
                 </Grid.Col>
-            </Grid>
-            <Space />
-               <FormSubmitButton form={form} />
-            <Space />
-
+                </Grid>
         </Stack>
-
         </form>
     )
 }
diff --git a/src/main/webui/src/ProposalEditorView/technicalGoals/edit.modal.tsx b/src/main/webui/src/ProposalEditorView/technicalGoals/edit.modal.tsx
index 4c62ba2e..40a8d0e2 100644
--- a/src/main/webui/src/ProposalEditorView/technicalGoals/edit.modal.tsx
+++ b/src/main/webui/src/ProposalEditorView/technicalGoals/edit.modal.tsx
@@ -56,6 +56,10 @@ export default function TechnicalGoalEditModal(
                     "New Technical Goal" :
                     "View/Edit Technical Goal No." + technicalGoalProps.technicalGoal?._id}
                 fullScreen
+                //size="auto"
+                //width={100}
+                //height="auto"
+                //centered
             >
                 <TechnicalGoalEditGroup {...props} />
             </Modal>
diff --git a/src/main/webui/src/ProposalEditorView/technicalGoals/technicalGoalsPanel.tsx b/src/main/webui/src/ProposalEditorView/technicalGoals/technicalGoalsPanel.tsx
index 43e4aee2..90dbad79 100644
--- a/src/main/webui/src/ProposalEditorView/technicalGoals/technicalGoalsPanel.tsx
+++ b/src/main/webui/src/ProposalEditorView/technicalGoals/technicalGoalsPanel.tsx
@@ -2,7 +2,7 @@ import {
     useProposalResourceGetObservingProposal,
     useTechnicalGoalResourceGetTechnicalGoals,
 } from 'src/generated/proposalToolComponents.ts';
-import {Group, Space} from '@mantine/core';
+import {Grid, Space} from '@mantine/core';
 import { useParams } from 'react-router-dom';
 import {TechnicalGoalsTable } from './technicalGoalTable.tsx';
 import { TechnicalGoal } from 'src/generated/proposalToolSchemas.ts';
@@ -10,6 +10,7 @@ import TechnicalGoalEditModal from './edit.modal.tsx';
 import { ReactElement } from 'react';
 import { JSON_SPACES } from 'src/constants.tsx';
 import {EditorPanelHeader, PanelFrame} from "../../commonPanel/appearance.tsx";
+import {ContextualHelpButton} from "../../commonButtons/contextualHelp.tsx"
 
 /**
  * the data type shared by the edit components.
@@ -64,12 +65,12 @@ function TechnicalGoalsPanel(): ReactElement {
             </PanelFrame>
         );
     }
-
     //<TechnicalGoalEditModal technicalGoal={undefined}/> is an alias for the "Add +" button,
     // the "view/edit" button is found in TechnicalGoalsTable, specifically one per row
     return (
         <PanelFrame fluid>
             <EditorPanelHeader proposalCode={Number(selectedProposalCode)} panelHeading={"Technical Goals"} />
+            <ContextualHelpButton messageId="MaintTechGoalList" />
             {goalsLoading ? (`Loading...`) :
                 <TechnicalGoalsTable
                     goals={goals}
@@ -78,11 +79,10 @@ function TechnicalGoalsPanel(): ReactElement {
                     selectedTechnicalGoal={undefined}/>
             }
             <Space h={"xl"}/>
-            <Group justify={'center'}>
-                {goalsLoading ? (`Loading...`) :
-                    <TechnicalGoalEditModal technicalGoal={undefined}/>
-                }
-            </Group>
+            <Grid>
+               <Grid.Col span={10}></Grid.Col>
+                   <TechnicalGoalEditModal technicalGoal={undefined}/>
+            </Grid>
         </PanelFrame>
     );
 }
diff --git a/src/main/webui/src/commonButtons/contextualHelp.tsx b/src/main/webui/src/commonButtons/contextualHelp.tsx
new file mode 100644
index 00000000..a07f1ca3
--- /dev/null
+++ b/src/main/webui/src/commonButtons/contextualHelp.tsx
@@ -0,0 +1,47 @@
+import { useState } from "react";
+import { Button, Grid, Space } from '@mantine/core';
+
+import {contextualHelpMessages} from "../../public/contextualHelpMessages.jsx";
+
+export function ContextualHelpButton(props : {messageId : string}) {
+
+  const [showingHelp, setShowingHelp] = useState(false);
+
+  const userLang = "-eng"; // hard-coded for now, ideally captured from user
+
+  const singleMessage = contextualHelpMessages.filter(aMessage =>
+        aMessage.id === props.messageId + userLang
+      );
+
+// need to trap when no message is found...
+
+  const listMessageRow = singleMessage.map(aMessage =>
+      <ul key={aMessage.id}>
+      <>{aMessage.message}</>
+      </ul>
+      );
+
+   const extractedRecord = listMessageRow;
+   const displayHelp = extractedRecord;
+   const clearHelp = "";
+   const labelClearHelp = "Clear Help";
+   const labelShowHelp = "Show Help";
+
+    return (
+
+        <>
+        <Space h={"xl"}/>
+        <Grid >
+           <Grid.Col span={10}></Grid.Col>
+           <Button color="cyan" onClick={() => {setShowingHelp(!showingHelp)}}>
+               {showingHelp ? labelClearHelp : labelShowHelp}
+           </Button>
+        </Grid>
+        <Space h={"xl"} />
+        <div className="display-linebreak" >
+           {showingHelp ? displayHelp : clearHelp}
+        </div>
+        <Space />
+        </>
+    )
+}
\ No newline at end of file
diff --git a/src/main/webui/src/errorHandling/error-page.jsx b/src/main/webui/src/errorHandling/error-page.jsx
new file mode 100644
index 00000000..a69b0a31
--- /dev/null
+++ b/src/main/webui/src/errorHandling/error-page.jsx
@@ -0,0 +1,19 @@
+// MWA... lifted straight from this tutorial https://reactrouter.com/en/main/start/tutorial#handling-not-found-errors
+
+import { useRouteError } from "react-router-dom";
+
+export default function ErrorPage() {
+  const error = useRouteError();
+  console.error(error);
+
+  return (
+    <div id="error-page">
+      <h1>Oops!</h1>
+      <center>
+      <p>Sorry, an unexpected error has occurred.</p>
+      <p>Polaris reports this message <i>{error.statusText || error.message}</i> </p>
+      <p>...please report it to the support team.</p>
+      </center>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/src/main/webui/src/index.css b/src/main/webui/src/index.css
index a53d5ec0..0e5c9014 100644
--- a/src/main/webui/src/index.css
+++ b/src/main/webui/src/index.css
@@ -15,4 +15,9 @@ code {
 h1 {
   text-align: center;
   margin: 50px;
-}
\ No newline at end of file
+}
+
+
+.display-linebreak {
+  white-space: pre-line;
+  }
\ No newline at end of file