diff --git a/src/ImageRunModal.jsx b/src/ImageRunModal.jsx
index 0c4d7335a..1a63c94e2 100644
--- a/src/ImageRunModal.jsx
+++ b/src/ImageRunModal.jsx
@@ -1166,29 +1166,22 @@ export class ImageRunModal extends React.Component {
             </Form>
         );
 
-        const cardFooter = () => {
-            let createRunText = _("Create and run");
-            let createText = _("Create");
-
-            if (this.props.prefill) {
-                createRunText = _("Clone and run");
-                createText = _("Clone");
-            }
-
-            return (
-                <>
-                    <Button variant='primary' id="create-image-create-run-btn" onClick={() => this.onCreateClicked(true)} isDisabled={(!image && selectedImage === "")}>
-                        {createRunText}
-                    </Button>
-                    <Button variant='secondary' id="create-image-create-btn" onClick={() => this.onCreateClicked(false)} isDisabled={(!image && selectedImage === "")}>
-                        {createText}
-                    </Button>
-                    <Button variant='link' className='btn-cancel' onClick={Dialogs.close}>
-                        {_("Cancel")}
-                    </Button>
-                </>
-            );
-        };
+        const createRunText = this.props.prefill ? _("Clone and run") : _("Create and run");
+        const createText = this.props.prefill ? _("Clone") : _("Create");
+
+        const runModalFooter = (
+            <>
+                <Button variant='primary' id="create-image-create-run-btn" onClick={() => this.onCreateClicked(true)} isDisabled={(!image && selectedImage === "")}>
+                    {createRunText}
+                </Button>
+                <Button variant='secondary' id="create-image-create-btn" onClick={() => this.onCreateClicked(false)} isDisabled={(!image && selectedImage === "")}>
+                    {createText}
+                </Button>
+                <Button variant='link' className='btn-cancel' onClick={Dialogs.close}>
+                    {_("Cancel")}
+                </Button>
+            </>
+        );
 
         return (
             <Modal isOpen
@@ -1202,8 +1195,8 @@ export class ImageRunModal extends React.Component {
                            Dialogs.close();
                        }
                    }}
-                   title={this.props.pod ? cockpit.format(_("Create container in $0"), this.props.pod.Name) : _("Create container")}
-                   footer={cardFooter()}
+                   title={this.props.pod ? cockpit.format(_("Create container in $0"), this.props.pod.Name) : (this.props.prefill ? _("Clone container") : _("Create container"))}
+                   footer={runModalFooter}
             >
                 {defaultBody}
             </Modal>
diff --git a/src/Notification.jsx b/src/Notification.jsx
index 8333a15a4..6cc553d48 100644
--- a/src/Notification.jsx
+++ b/src/Notification.jsx
@@ -47,7 +47,7 @@ export const ErrorNotification = ({ errorMessage, errorDetail, onDismiss }) => {
 export const WarningNotification = ({ warningMessage, warningDetail }) => {
     return (
         <Alert isInline variant='warning' title={warningMessage}>
-            { warningDetail && <p> {_("Warning message")}: <samp>{warningDetail}</samp> </p> }
+            { warningDetail && <p>{warningDetail}</p> }
         </Alert>
     );
 };