diff --git a/hyperglass/ui/components/Header.js b/hyperglass/ui/components/Header.js
index 64215c3..47f6f18 100644
--- a/hyperglass/ui/components/Header.js
+++ b/hyperglass/ui/components/Header.js
@@ -31,6 +31,10 @@ const icon = { light: "moon", dark: "sun" };
 const bg = { light: "white", dark: "black" };
 const colorSwitch = { dark: "Switch to light mode", light: "Switch to dark mode" };
 const headerTransition = { type: "spring", ease: "anticipate", damping: 15, stiffness: 100 };
+const titleJustify = {
+    true: ["flex-end", "flex-end", "center", "center"],
+    false: ["flex-start", "flex-start", "center", "center"]
+};
 
 export default ({ height, isSubmitting, handleFormReset, ...props }) => {
     const { colorMode, toggleColorMode } = useColorMode();
@@ -44,6 +48,7 @@ export default ({ height, isSubmitting, handleFormReset, ...props }) => {
                 exit={{ opacity: 0, x: -50 }}
                 alignItems="center"
                 mb={[null, "auto"]}
+                ml={isSubmitting ? 2 : null}
             >
                 <AnimatedResetButton isSubmitting={isSubmitting} onClick={handleFormReset} />
             </AnimatedFlex>
@@ -58,7 +63,7 @@ export default ({ height, isSubmitting, handleFormReset, ...props }) => {
             initial={{ scale: 0.5 }}
             animate={isSubmitting ? "small" : "fullSize"}
             variants={titleVariants[mediaSize]}
-            justifyContent="center"
+            justifyContent={titleJustify[isSubmitting]}
             mb={[null, isSubmitting ? "auto" : null]}
             mt={[null, isSubmitting ? null : "auto"]}
             maxW="100%"
@@ -75,12 +80,12 @@ export default ({ height, isSubmitting, handleFormReset, ...props }) => {
             initial={{ opacity: 0 }}
             animate={{ opacity: 1 }}
             mb={[null, "auto"]}
+            mr={isSubmitting ? null : 2}
         >
             <IconButton
                 aria-label={colorSwitch[colorMode]}
                 variant="ghost"
                 color="current"
-                ml={2}
                 pl={0}
                 fontSize="20px"
                 onClick={toggleColorMode}
@@ -118,7 +123,13 @@ export default ({ height, isSubmitting, handleFormReset, ...props }) => {
             height={height}
             {...props}
         >
-            <Flex w="100%" mx="auto" py={6} justify="space-between" alignItems="center">
+            <Flex
+                w="100%"
+                mx="auto"
+                py={6}
+                justify="space-between"
+                alignItems={isSubmitting ? "center" : "flex-start"}
+            >
                 {layout[isSubmitting][mediaSize]}
             </Flex>
         </Flex>
diff --git a/hyperglass/ui/components/Title.js b/hyperglass/ui/components/Title.js
index 9a19fca..29adef1 100644
--- a/hyperglass/ui/components/Title.js
+++ b/hyperglass/ui/components/Title.js
@@ -21,9 +21,9 @@ const TitleOnly = ({ text, showSubtitle }) => (
     </Heading>
 );
 
-const SubtitleOnly = React.forwardRef(({ text, size = "md", ...props }, ref) => (
+const SubtitleOnly = React.forwardRef(({ text, mediaSize, size = "md", ...props }, ref) => (
     <Heading ref={ref} as="h3" size={size} {...props}>
-        <Textfit mode="single" max={20}>
+        <Textfit mode="single" max={mediaSize === "sm" ? 13 : 25}>
             {text}
         </Textfit>
     </Heading>
@@ -35,9 +35,17 @@ const textAlignment = { false: ["right", "center"], true: ["left", "center"] };
 
 const TextOnly = ({ text, mediaSize, showSubtitle, ...props }) => (
     <Stack spacing={2} maxW="100%" textAlign={textAlignment[showSubtitle]} {...props}>
-        <TitleOnly text={text.title} showSubtitle={showSubtitle} />
+        <Textfit mode="single" max={20}>
+            <TitleOnly text={text.title} showSubtitle={showSubtitle} />
+        </Textfit>
         <AnimatePresence>
-            {showSubtitle && <AnimatedSubtitle text={text.subtitle} {...subtitleAnimation} />}
+            {showSubtitle && (
+                <AnimatedSubtitle
+                    text={text.subtitle}
+                    mediaSize={mediaSize}
+                    {...subtitleAnimation}
+                />
+            )}
         </AnimatePresence>
     </Stack>
 );
@@ -75,10 +83,6 @@ const widthMap = {
     all: ["90%", "90%", "25%", "25%"]
 };
 
-const btnJustify = {
-    true: ["flex-end", "center"],
-    false: ["flex-start", "center"]
-};
 export default React.forwardRef(({ onClick, isSubmitting, ...props }, ref) => {
     const { web } = useConfig();
     const { mediaSize } = useMedia();
@@ -92,7 +96,6 @@ export default React.forwardRef(({ onClick, isSubmitting, ...props }, ref) => {
             flexWrap="wrap"
             _focus={{ boxShadow: "none" }}
             _hover={{ textDecoration: "none" }}
-            justifyContent={btnJustify[isSubmitting]}
             px={0}
             maxW={widthMap[titleMode]}
             {...props}