diff --git a/packages/images/src/components/image.js b/packages/images/src/components/image.js
index 0aa2e95f..8bf9ae23 100644
--- a/packages/images/src/components/image.js
+++ b/packages/images/src/components/image.js
@@ -30,64 +30,99 @@ const A = styled(Anchor)`
   font-weight: ${props => props.theme.font.weight.semibold};
 `;
 
+const CardAnchor = styled(Anchor)`
+  color: ${props => props.theme.text};
+  text-decoration: none;
+`;
+
+const Type = styled(Margin)`
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+`;
+
+const Content = styled(Padding)`
+  max-width: calc(100% - 48px);
+  overflow: hidden;
+`;
+
+const Max = styled(Flex)`
+  max-width: 100%;
+  height: 100%;
+`;
+
+const DividerContainer = styled(Margin)`
+  height: 100%;
+`;
+
+const Actions = styled(Flex)`
+  width: 48px;
+  height: 48px;
+  min-width: 48px;
+`;
+
 export const Image = ({ name, os, version, type }) => (
   <Margin bottom={3}>
-    <Card>
-      <CardHeader white>
-        <Padding left={2} right={2}>
-          <Flex full alignCenter>
-            <Margin right={2}>
-              {React.createElement(OS[os], {
-                width: '24',
-                height: '24'
-              })}
-            </Margin>
-            <A to={`/${name}`} component={Link}>
-              {name}
-            </A>
-          </Flex>
-        </Padding>
-      </CardHeader>
-      <Flex justifyBetween>
-        <Padding left={2} top={2} bottom={2}>
-          <Flex justifyBetween>
-            <Flex>
-              <Flex>{version}</Flex>
-              <Margin left={1}>
-                <Divider width={remcalc(1)} height="100%" />
+    <CardAnchor to={`/${name}`} component={Link}>
+      <Card radius>
+        <CardHeader white radius>
+          <Padding left={2} right={2}>
+            <Flex full alignCenter>
+              <Margin right={2}>
+                {React.createElement(OS[os], {
+                  width: '24',
+                  height: '24'
+                })}
               </Margin>
-              <Padding left={2}>{ImageType[type]}</Padding>
+              <A to={`/${name}`} component={Link}>
+                {name}
+              </A>
             </Flex>
-          </Flex>
-        </Padding>
-        <PopoverContainer clickable>
-          <FlexItem basis={remcalc(48)}>
-            <PopoverTarget box style={{ borderLeft: '1px solid #D8D8D8' }}>
-              <ActionsIcon />
-            </PopoverTarget>
-            <Popover placement="bottom">
-              <PopoverItem disabled={false} onClick={() => {}}>
-                Create Instance
-              </PopoverItem>
-              <PopoverDivider />
-              <PopoverItem disabled={false} onClick={() => {}}>
-                Remove
-              </PopoverItem>
-            </Popover>
-          </FlexItem>
-        </PopoverContainer>
-      </Flex>
-    </Card>
+          </Padding>
+        </CardHeader>
+        <Flex justifyBetween>
+          <Content left={2} top={2} bottom={2}>
+            <Max justifyBetween>
+              <Max alignCenter>
+                <Flex>{version}</Flex>
+                <DividerContainer left={2}>
+                  <Divider width={remcalc(1)} height="100%" />
+                </DividerContainer>
+                <Type left={2}>{ImageType[type]}</Type>
+              </Max>
+            </Max>
+          </Content>
+          <PopoverContainer clickable>
+            <Actions>
+              <PopoverTarget box style={{ borderLeft: '1px solid #D8D8D8' }}>
+                <ActionsIcon />
+              </PopoverTarget>
+              <Popover placement="bottom">
+                <PopoverItem disabled={false} onClick={() => {}}>
+                  Create Instance
+                </PopoverItem>
+                <PopoverDivider />
+                <PopoverItem disabled={false} onClick={() => {}}>
+                  Remove
+                </PopoverItem>
+              </Popover>
+            </Actions>
+          </PopoverContainer>
+        </Flex>
+      </Card>
+    </CardAnchor>
   </Margin>
 );
 
-export const Filters = () => (
+export const Filters = ({ selected }) => (
   <Fragment>
     <FormGroup name="image-type" value="all" field={Field} type="radio">
       <Radio noMargin>
         <Flex alignCenter>
           <Margin right={2}>
-            <FormLabel>All</FormLabel>
+            <FormLabel big normal={selected !== 'all'}>
+              All
+            </FormLabel>
           </Margin>
         </Flex>
       </Radio>
@@ -101,7 +136,9 @@ export const Filters = () => (
       <Radio noMargin>
         <Flex alignCenter>
           <Margin right={2}>
-            <FormLabel>Virtual machines</FormLabel>
+            <FormLabel big normal={selected !== 'hardware-virtual-machine'}>
+              Virtual machines
+            </FormLabel>
           </Margin>
         </Flex>
       </Radio>
@@ -115,7 +152,9 @@ export const Filters = () => (
       <Radio noMargin>
         <Flex alignCenter>
           <Margin right={2}>
-            <FormLabel>Infrastructure container</FormLabel>
+            <FormLabel big normal={selected !== 'infrastructure-container'}>
+              Infrastructure container
+            </FormLabel>
           </Margin>
         </Flex>
       </Radio>
diff --git a/packages/images/src/components/summary.js b/packages/images/src/components/summary.js
index d9f822f7..7c9b7f8a 100644
--- a/packages/images/src/components/summary.js
+++ b/packages/images/src/components/summary.js
@@ -19,7 +19,9 @@ import {
   CopiableField,
   DuplicateIcon,
   DeleteIcon,
-  DotIcon
+  DotIcon,
+  FormLabel,
+  Input
 } from 'joyent-ui-toolkit';
 
 import { ImageType, OS } from '@root/constants';
@@ -139,10 +141,17 @@ export default withTheme(({ theme = {}, ...image }) => (
             </Margin>
             <CopiableField text={(image.id || '').split('-')[0]} label="ID" />
             <CopiableField text={image.id} label="UUID" />
-            <CopiableField
-              text={titleCase(image.os)}
-              label="Operating system"
-            />
+            <Row>
+              <Col xs={12} md={7}>
+                <FormLabel>Operating system</FormLabel>
+                <Input
+                  monospace
+                  onBlur={null}
+                  fluid
+                  value={titleCase(image.os)}
+                />
+              </Col>
+            </Row>
           </Padding>
         </CardOutlet>
       </Card>
diff --git a/packages/images/src/containers/list.js b/packages/images/src/containers/list.js
index 8131e024..cbd7188b 100644
--- a/packages/images/src/containers/list.js
+++ b/packages/images/src/containers/list.js
@@ -32,7 +32,8 @@ export const List = ({
   allImages = [],
   loading = false,
   error = null,
-  history
+  history,
+  typeValue
 }) => (
   <ViewContainer main>
     <Divider height={remcalc(30)} transparent />
@@ -63,7 +64,11 @@ export const List = ({
           form={TOGGLE_FORM_DETAILS}
           initialValues={{ 'image-type': 'all' }}
         >
-          {props => (allImages.length ? <Filters {...props} /> : null)}
+          {props =>
+            allImages.length ? (
+              <Filters selected={typeValue} {...props} />
+            ) : null
+          }
         </ReduxForm>
       </Margin>
       <Row>
@@ -124,7 +129,8 @@ export default compose(
             return true;
         }
       }),
-      allImages: images
+      allImages: images,
+      typeValue
     };
   })
 )(List);
diff --git a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png
index ef91d040..23d05a9e 100644
Binary files a/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png and b/packages/my-joy-beta/src/components/__tests__/__image_snapshots__/key-value-ui-js-key-value-submitting-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/__tests__/__snapshots__/cns.spec.js.snap b/packages/my-joy-beta/src/components/__tests__/__snapshots__/cns.spec.js.snap
index a30310c2..94d971e8 100644
--- a/packages/my-joy-beta/src/components/__tests__/__snapshots__/cns.spec.js.snap
+++ b/packages/my-joy-beta/src/components/__tests__/__snapshots__/cns.spec.js.snap
@@ -798,6 +798,7 @@ exports[`renders <Hostname values /> without throwing 1`] = `
   cursor: not-allowed;
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
diff --git a/packages/my-joy-beta/src/components/__tests__/__snapshots__/key-value.spec.js.snap b/packages/my-joy-beta/src/components/__tests__/__snapshots__/key-value.spec.js.snap
index b85d8edb..2fb68cc3 100644
--- a/packages/my-joy-beta/src/components/__tests__/__snapshots__/key-value.spec.js.snap
+++ b/packages/my-joy-beta/src/components/__tests__/__snapshots__/key-value.spec.js.snap
@@ -3042,6 +3042,7 @@ exports[`renders <KeyValue input="textarea" /> without throwing 1`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/images-ui-js-images-images-name-stuff-image-name-stuff-1-snap.png b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/images-ui-js-images-images-name-stuff-image-name-stuff-1-snap.png
index d340b338..da044818 100644
Binary files a/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/images-ui-js-images-images-name-stuff-image-name-stuff-1-snap.png and b/packages/my-joy-beta/src/components/create-instance/__tests__/__image_snapshots__/images-ui-js-images-images-name-stuff-image-name-stuff-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap b/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap
index 5f789a8c..4d29849e 100644
--- a/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap
+++ b/packages/my-joy-beta/src/components/create-instance/__tests__/__snapshots__/package.spec.js.snap
@@ -1094,10 +1094,6 @@ exports[`renders <Package /> without throwing 1`] = `
   align-items: center;
 }
 
-.c3 label {
-  font-weight: 400;
-}
-
 .c1 {
   border-width: 0.0625rem;
   border-style: solid;
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/list-ui-js-item-mutating-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/list-ui-js-item-mutating-1-snap.png
index 3dcf40f6..d2e4fdea 100644
Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/list-ui-js-item-mutating-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/list-ui-js-item-mutating-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png
index 5b478772..5c7c5bd9 100644
Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/snapshots-ui-js-item-mutating-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png
index 4fa445b6..5873626e 100644
Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-instance-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-instance-1-snap.png
index fb0a4e9a..ec050e51 100644
Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-instance-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-instance-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-instance-2-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-instance-2-snap.png
index 6af48810..1f50b099 100644
Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-instance-2-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-instance-2-snap.png differ
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png
index 58f3689c..5849c0f6 100644
Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-provisioning-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-provisioning-1-snap.png
index 785f7783..a09f69da 100644
Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-provisioning-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-provisioning-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-running-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-running-1-snap.png
index a4701b0a..4da743a5 100644
Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-running-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-running-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-stopped-1-snap.png b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-stopped-1-snap.png
index 8dc0b782..bc070755 100644
Binary files a/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-stopped-1-snap.png and b/packages/my-joy-beta/src/components/instances/__tests__/__image_snapshots__/summary-ui-js-summary-state-stopped-1-snap.png differ
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/metadata.spec.js.snap b/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/metadata.spec.js.snap
index b7c127dd..ab4bcbb4 100644
--- a/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/metadata.spec.js.snap
+++ b/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/metadata.spec.js.snap
@@ -769,6 +769,7 @@ exports[`renders <AddForm /> without throwing 1`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
@@ -1833,6 +1834,7 @@ exports[`renders <EditForm /> without throwing 1`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
diff --git a/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/summary.spec.js.snap b/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/summary.spec.js.snap
index 2253b107..06a023f1 100644
--- a/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/summary.spec.js.snap
+++ b/packages/my-joy-beta/src/components/instances/__tests__/__snapshots__/summary.spec.js.snap
@@ -860,6 +860,7 @@ exports[`renders <Summary /> without throwing 1`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   font-size: 0.9375rem;
   line-height: normal !important;
@@ -938,6 +939,7 @@ exports[`renders <Summary /> without throwing 1`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
@@ -2822,6 +2824,7 @@ exports[`renders <Summary instance /> without throwing 1`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
@@ -4883,6 +4886,7 @@ exports[`renders <Summary instance /> without throwing 2`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
@@ -6832,6 +6836,7 @@ exports[`renders <Summary starting stopping rebooting removing /> without throwi
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   font-size: 0.9375rem;
   line-height: normal !important;
@@ -6910,6 +6915,7 @@ exports[`renders <Summary starting stopping rebooting removing /> without throwi
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
@@ -8846,6 +8852,7 @@ exports[`renders <Summary state /> without throwing 1`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   font-size: 0.9375rem;
   line-height: normal !important;
@@ -8924,6 +8931,7 @@ exports[`renders <Summary state /> without throwing 1`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
@@ -10808,6 +10816,7 @@ exports[`renders <Summary state /> without throwing 2`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   font-size: 0.9375rem;
   line-height: normal !important;
@@ -10886,6 +10895,7 @@ exports[`renders <Summary state /> without throwing 2`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
@@ -12606,6 +12616,7 @@ exports[`renders <Summary state /> without throwing 3`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   font-size: 0.9375rem;
   line-height: normal !important;
@@ -12684,6 +12695,7 @@ exports[`renders <Summary state /> without throwing 3`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
diff --git a/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/networks-ui-js-networks-loading-expanded-1-snap.png b/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/networks-ui-js-networks-loading-expanded-1-snap.png
index 3e09e343..4ab3f03b 100644
Binary files a/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/networks-ui-js-networks-loading-expanded-1-snap.png and b/packages/my-joy-beta/src/containers/create-instance/__tests__/__image_snapshots__/networks-ui-js-networks-loading-expanded-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/metadata.spec.js.snap b/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/metadata.spec.js.snap
index f14b34e4..e8780cc9 100644
--- a/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/metadata.spec.js.snap
+++ b/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/metadata.spec.js.snap
@@ -1186,6 +1186,7 @@ Array [
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
@@ -3124,6 +3125,7 @@ Array [
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
@@ -4241,6 +4243,7 @@ Array [
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
@@ -5629,6 +5632,7 @@ Array [
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
@@ -6765,6 +6769,7 @@ Array [
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
diff --git a/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/user-script.spec.js.snap b/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/user-script.spec.js.snap
index 4b3c262f..a18e7287 100644
--- a/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/user-script.spec.js.snap
+++ b/packages/my-joy-beta/src/containers/create-instance/__tests__/__snapshots__/user-script.spec.js.snap
@@ -849,6 +849,7 @@ Array [
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
@@ -2039,6 +2040,7 @@ Array [
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
@@ -3873,6 +3875,7 @@ Array [
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
@@ -5172,6 +5175,7 @@ Array [
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
@@ -6509,6 +6513,7 @@ Array [
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
@@ -7780,6 +7785,7 @@ Array [
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-1-snap.png
index ff69f5e4..12b51602 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-hostnames-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-hostnames-1-snap.png
index 56794e01..bebc77f4 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-hostnames-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-hostnames-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png
index e7efe3d2..bb74b9a7 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-loading-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-mutating-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-mutating-1-snap.png
index 689130d5..b25cb50b 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-mutating-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-mutating-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-mutation-error-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-mutation-error-1-snap.png
index a6c429d1..2a7f4e2b 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-mutation-error-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-mutation-error-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-services-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-services-1-snap.png
index d2fbbe2d..a97dd089 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-services-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/cns-ui-js-cns-services-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-1-snap.png
index 6326e063..2b6cc658 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-inactive-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-inactive-1-snap.png
index d7ca5e65..7fc61c7e 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-inactive-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-inactive-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png
index fd243595..fc0690d2 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-loading-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-tag-rules-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-tag-rules-1-snap.png
index 1b794111..1eb42c83 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-tag-rules-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-tag-rules-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-tag-rules-2-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-tag-rules-2-snap.png
index 8a6b003f..c44fc4d6 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-tag-rules-2-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/firewall-ui-js-firewall-tag-rules-2-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-1-snap.png
index d66780c6..5476743d 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-all-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-all-1-snap.png
index 3e44a29b..6df95407 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-all-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-all-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-all-allowed-actions-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-all-allowed-actions-1-snap.png
index 3350991f..bf39650c 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-all-allowed-actions-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-instances-selected-all-allowed-actions-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png
index 5234cad1..c9cf8b55 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/list-ui-js-list-loading-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png
index 8830d29f..fcf193c1 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-loading-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png
index 3c27387f..c6ec029c 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/metadata-ui-js-metadata-metadata-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png
index b6ff9231..023e6b2f 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/networks-ui-js-networks-loading-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png
index f02804ce..b9b097b9 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png
index 99bbcb21..b9b097b9 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-error-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-error-1-snap.png
index 99bbcb21..89528ed1 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-error-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-loading-error-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png
index 839e0183..c672f70e 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-mutation-error-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png
index 99bbcb21..8955ddb5 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-2-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-2-snap.png
index fb0a4e9a..ec050e51 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-2-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-2-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-3-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-3-snap.png
index 6af48810..1f50b099 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-3-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/summary-ui-js-summary-starting-stopping-rebooting-removing-3-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png
index d5273c51..4fa52f5c 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-editing-removing-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-loading-1-snap.png b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-loading-1-snap.png
index 03518b0d..b211fed7 100644
Binary files a/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-loading-1-snap.png and b/packages/my-joy-beta/src/containers/instances/__tests__/__image_snapshots__/tags-ui-js-tags-loading-1-snap.png differ
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/cns.spec.js.snap b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/cns.spec.js.snap
index adee6a2e..06f447cd 100644
--- a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/cns.spec.js.snap
+++ b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/cns.spec.js.snap
@@ -1622,6 +1622,7 @@ exports[`renders <Cns hostnames /> without throwing 1`] = `
   cursor: not-allowed;
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
@@ -4069,6 +4070,7 @@ exports[`renders <Cns mutating /> without throwing 1`] = `
   cursor: not-allowed;
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/metadata.spec.js.snap b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/metadata.spec.js.snap
index 298c1549..acb851c2 100644
--- a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/metadata.spec.js.snap
+++ b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/metadata.spec.js.snap
@@ -1427,6 +1427,7 @@ exports[`renders <Metadata addOpen /> without throwing 1`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
@@ -4065,6 +4066,7 @@ exports[`renders <Metadata metadata /> without throwing 1`] = `
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   text-overflow: ellipsis;
   resize: vertical;
   font-size: 0.9375rem;
diff --git a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/summary.spec.js.snap b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/summary.spec.js.snap
index 3fe219bf..8b788ca5 100644
--- a/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/summary.spec.js.snap
+++ b/packages/my-joy-beta/src/containers/instances/__tests__/__snapshots__/summary.spec.js.snap
@@ -1928,6 +1928,7 @@ exports[`renders <Summary starting stopping rebooting removing /> without throwi
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
@@ -4027,6 +4028,7 @@ exports[`renders <Summary starting stopping rebooting removing /> without throwi
   color: rgba(73,73,73,1);
   font-family: "Roboto Mono",monospace;
   width: 100%;
+  min-width: 100%;
   font-size: 0.9375rem;
   line-height: normal !important;
   font-style: normal;
diff --git a/packages/ui-toolkit/src/card/card.js b/packages/ui-toolkit/src/card/card.js
index 344ffffd..9956fd17 100644
--- a/packages/ui-toolkit/src/card/card.js
+++ b/packages/ui-toolkit/src/card/card.js
@@ -44,6 +44,10 @@ export const BaseCard = styled.div`
   background-color: ${props => props.theme.white};
   border-color: ${props => props.theme.grey};
 
+  ${is('radius')`
+    border-radius: ${remcalc(4)};
+  `}
+
   ${is('shadow')`
     /* primary */
     box-shadow: ${props => props.theme.shadows.bottomShadow};
diff --git a/packages/ui-toolkit/src/card/header.js b/packages/ui-toolkit/src/card/header.js
index 3b978190..8be9b544 100644
--- a/packages/ui-toolkit/src/card/header.js
+++ b/packages/ui-toolkit/src/card/header.js
@@ -17,6 +17,12 @@ const BaseHeader = BaseCard.extend`
 
   margin: ${remcalc(-1)} ${remcalc(-1)} 0 ${remcalc(-1)};
 
+  ${is('radius')`
+    border-radius: ${remcalc(4)};
+    border-bottom-right-radius: ${remcalc(0)};
+    border-bottom-left-radius: ${remcalc(0)};
+  `}
+
   ${is('parentCollapsed')`
     margin: ${remcalc(-1)};
     box-shadow: none;
diff --git a/packages/ui-toolkit/src/form/__tests__/__snapshots__/form.spec.js.snap b/packages/ui-toolkit/src/form/__tests__/__snapshots__/form.spec.js.snap
index f18d0a68..5e4d9e92 100644
--- a/packages/ui-toolkit/src/form/__tests__/__snapshots__/form.spec.js.snap
+++ b/packages/ui-toolkit/src/form/__tests__/__snapshots__/form.spec.js.snap
@@ -525,10 +525,6 @@ exports[`Form Radio 1`] = `
   align-items: center;
 }
 
-.c0 label {
-  font-weight: 400;
-}
-
 <li
   className="c0"
   disabled={false}
diff --git a/packages/ui-toolkit/src/form/base/input.js b/packages/ui-toolkit/src/form/base/input.js
index 3695b252..69fdb9fa 100644
--- a/packages/ui-toolkit/src/form/base/input.js
+++ b/packages/ui-toolkit/src/form/base/input.js
@@ -114,6 +114,7 @@ const style = css`
 
   ${is('fluid')`
     width: 100%;
+    min-width: 100%;
   `};
 
   ${is('xSmall')`
diff --git a/packages/ui-toolkit/src/form/label.js b/packages/ui-toolkit/src/form/label.js
index 2ce517cf..daf0c087 100644
--- a/packages/ui-toolkit/src/form/label.js
+++ b/packages/ui-toolkit/src/form/label.js
@@ -11,9 +11,17 @@ const StyledLabel = Label.extend`
   white-space: pre;
   font-size: ${remcalc(13)};
 
-  ${is('disabled')`
+  ${is('disabled') `
     color:  ${props => props.theme.grey};
   `};
+
+  ${is('big') `
+    font-size: ${remcalc(15)};
+  `};
+
+  ${is('normal') `
+      font-weight: ${props => props.theme.font.weight.normal};
+  `};
 `;
 
 export default props => {
diff --git a/packages/ui-toolkit/src/form/radio.js b/packages/ui-toolkit/src/form/radio.js
index 60a4a6a2..fe71c6f3 100644
--- a/packages/ui-toolkit/src/form/radio.js
+++ b/packages/ui-toolkit/src/form/radio.js
@@ -10,10 +10,6 @@ const Li = styled.li`
   list-style-type: none;
   display: flex;
   align-items: center;
-
-  label {
-    font-weight: 400;
-  }
 `;
 
 const Ul = styled.ul`