diff --git a/client/src/components/logLine.jsx b/client/src/components/logLine.jsx
index 436a05b..34b309c 100644
--- a/client/src/components/logLine.jsx
+++ b/client/src/components/logLine.jsx
@@ -55,6 +55,10 @@ const LogLine = ({ message, docker, isMobile }) => {
 
   if(docker) {
     let parts = html.match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+Z/)
+    if(!parts) {
+      console.error('Could not parse log line', html)
+      return <div dangerouslySetInnerHTML={{ __html: html }} />;
+    }
     let restString = html.replace(parts[0], '')
     
     return <Stack direction={isMobile ? 'column' : 'row'} spacing={1}>
diff --git a/client/src/pages/servapps/containers/network.jsx b/client/src/pages/servapps/containers/network.jsx
index 9f90d14..7e91e54 100644
--- a/client/src/pages/servapps/containers/network.jsx
+++ b/client/src/pages/servapps/containers/network.jsx
@@ -104,6 +104,11 @@ const NetworkContainerSetup = ({ config, containerInfo, refresh }) => {
             <Stack spacing={2}>
               <MainCard title={'Ports'}>
                 <Stack spacing={4}>
+                  {containerInfo.State.Status !== 'running' && (
+                  <Alert severity="warning" style={{ marginBottom: '0px' }}>
+                      This container is not running. Editing any settings will cause the container to start again.
+                    </Alert>
+                  )}
                   <div>
                     {formik.values.ports.map((port, idx) => (
                       <Grid container key={idx}>
diff --git a/client/src/pages/servapps/containers/overview.jsx b/client/src/pages/servapps/containers/overview.jsx
index ba4d3bb..c1653f1 100644
--- a/client/src/pages/servapps/containers/overview.jsx
+++ b/client/src/pages/servapps/containers/overview.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Checkbox, Chip, CircularProgress, Stack, Typography, useMediaQuery } from '@mui/material';
+import { Alert, Checkbox, Chip, CircularProgress, Stack, Typography, useMediaQuery } from '@mui/material';
 import MainCard from '../../../components/MainCard';
 import { ContainerOutlined, DesktopOutlined, InfoCircleOutlined, NodeExpandOutlined, PlayCircleOutlined, PlusCircleOutlined, SafetyCertificateOutlined, SettingOutlined } from '@ant-design/icons';
 import { getFaviconURL, getContainersRoutes } from '../../../utils/routes';
@@ -48,6 +48,7 @@ const ContainerOverview = ({ containerInfo, config, refresh }) => {
   return (
     <div style={{ maxWidth: '1000px', width: '100%' }}>
       <RestartModal openModal={openRestartModal} setOpenModal={setOpenRestartModal} />
+
       <ExposeModal
         openModal={openModal} 
         setOpenModal={setOpenModal}
@@ -99,6 +100,11 @@ const ContainerOverview = ({ containerInfo, config, refresh }) => {
                 }}
               />
             </Stack>
+            {containerInfo.State.Status !== 'running' && (
+            <Alert severity="warning" style={{ marginBottom: '10px' }}>
+                This container is not running. Editing any settings will cause the container to start again.
+              </Alert>
+            )}
             <strong><ContainerOutlined /> Image</strong>
             <div style={info}>{Image}</div>
             <strong><DesktopOutlined /> Name</strong>
@@ -113,7 +119,7 @@ const ContainerOverview = ({ containerInfo, config, refresh }) => {
             <Stack style={{ fontSize: '80%' }} direction={"row"} alignItems="center">
               <Checkbox
                 checked={Config.Labels['cosmos-force-network-secured'] === 'true'}
-                disabled={State.Status !== 'running' || isUpdating}
+                disabled={isUpdating}
                 onChange={(e) => {
                   setIsUpdating(true);
                   API.docker.secure(Name, e.target.checked).then(() => {
diff --git a/client/src/pages/servapps/containers/setup.jsx b/client/src/pages/servapps/containers/setup.jsx
index 2b9fd0c..bdf6cb6 100644
--- a/client/src/pages/servapps/containers/setup.jsx
+++ b/client/src/pages/servapps/containers/setup.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Formik } from 'formik';
-import { Button, Stack, Grid, MenuItem, TextField, IconButton, FormHelperText, useMediaQuery, useTheme } from '@mui/material';
+import { Button, Stack, Grid, MenuItem, TextField, IconButton, FormHelperText, useMediaQuery, useTheme, Alert } from '@mui/material';
 import MainCard from '../../../components/MainCard';
 import { CosmosCheckbox, CosmosFormDivider, CosmosInputText, CosmosSelect }
    from '../../config/users/formShortcuts';
@@ -82,6 +82,11 @@ const DockerContainerSetup = ({config, containerInfo, refresh}) => {
           <form noValidate onSubmit={formik.handleSubmit}>
             <Stack spacing={2}>
               <MainCard title={'Docker Container Setup'}>
+              {containerInfo.State.Status !== 'running' && (
+              <Alert severity="warning" style={{ marginBottom: '15px' }}>
+                  This container is not running. Editing any settings will cause the container to start again.
+                </Alert>
+              )}
                 <Grid container spacing={4}>
                     <CosmosInputText
                       name="image"
diff --git a/client/src/pages/servapps/containers/volumes.jsx b/client/src/pages/servapps/containers/volumes.jsx
index 4914ca3..e6e9496 100644
--- a/client/src/pages/servapps/containers/volumes.jsx
+++ b/client/src/pages/servapps/containers/volumes.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Formik } from 'formik';
-import { Button, Stack, Grid, MenuItem, TextField, IconButton, FormHelperText, CircularProgress, useTheme, Checkbox } from '@mui/material';
+import { Button, Stack, Grid, MenuItem, TextField, IconButton, FormHelperText, CircularProgress, useTheme, Checkbox, Alert } from '@mui/material';
 import MainCard from '../../../components/MainCard';
 import { CosmosCheckbox, CosmosFormDivider, CosmosInputText, CosmosSelect }
   from '../../config/users/formShortcuts';
@@ -89,6 +89,11 @@ const VolumeContainerSetup = ({ config, containerInfo, refresh }) => {
         {(formik) => (
           <form noValidate onSubmit={formik.handleSubmit}>
             <MainCard title={'Volume Mounts'}>
+            {containerInfo.State.Status !== 'running' && (
+            <Alert severity="warning" style={{ marginBottom: '15px' }}>
+                This container is not running. Editing any settings will cause the container to start again.
+              </Alert>
+            )}
               <Grid container spacing={4}>
                 <Grid item xs={12}>
                       {volumes && <PrettyTableView
diff --git a/package.json b/package.json
index 49d09b7..2e582db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.4.0-unstable11",
+  "version": "0.4.0-unstable12",
   "description": "",
   "main": "test-server.js",
   "bugs": {