diff --git a/consoles/my-joy-instances/src/containers/instances/list.js b/consoles/my-joy-instances/src/containers/instances/list.js
index c03d0179..409b73ad 100644
--- a/consoles/my-joy-instances/src/containers/instances/list.js
+++ b/consoles/my-joy-instances/src/containers/instances/list.js
@@ -175,7 +175,7 @@ export const List = ({
               searchLabel="Filter instances"
               searchable={!_loading}
               actionLabel="Create Instance"
-              actionTo="/instances/~create"
+              actionTo="/instances/~create/name"
             />
           )}
         </ReduxForm>
diff --git a/packages/instance-steps/src/affinity/index.js b/packages/instance-steps/src/affinity/index.js
index addbc158..dcec00a2 100644
--- a/packages/instance-steps/src/affinity/index.js
+++ b/packages/instance-steps/src/affinity/index.js
@@ -170,7 +170,7 @@ const Affinity = ({
           {!addOpen && exitingRule ? (
             <Margin top={5}>
               <Button type="button" component={Link} to={next}>
-                Save
+                Next
               </Button>
             </Margin>
           ) : null}
@@ -186,7 +186,7 @@ export default compose(
     const creatingRule = get(form, `${IC_AFF_F_ADD}.values`, null);
     const exitingRule = get(values, IC_AFF_V_AFF, null);
 
-    const addOpen = get(values, IC_AFF_V_ADD_OPEN, false);
+    const addOpen = get(values, IC_AFF_V_ADD_OPEN, true);
     const editOpen = get(values, IC_AFF_V_EDIT_OPEN, false);
 
     return {
diff --git a/packages/instance-steps/src/cns/index.js b/packages/instance-steps/src/cns/index.js
index 064bcf04..3e204890 100644
--- a/packages/instance-steps/src/cns/index.js
+++ b/packages/instance-steps/src/cns/index.js
@@ -84,7 +84,7 @@ const CnsContainer = ({
           </Cns>
           <Margin top={5}>
             <Button type="button" component={Link} to={next}>
-              Save
+              Next
             </Button>
           </Margin>
           <Margin top={3}>
diff --git a/packages/instance-steps/src/image/index.js b/packages/instance-steps/src/image/index.js
index c1a10f8c..8ca449ad 100644
--- a/packages/instance-steps/src/image/index.js
+++ b/packages/instance-steps/src/image/index.js
@@ -80,7 +80,7 @@ const Image = ({
                     />
                     <Margin top="2">
                       <Button type="button" component={Link} to={next}>
-                        Save
+                        Next
                       </Button>
                     </Margin>
                   </Fragment>
diff --git a/packages/instance-steps/src/metadata/components.js b/packages/instance-steps/src/metadata/components.js
index a7b31a95..c2c695c2 100644
--- a/packages/instance-steps/src/metadata/components.js
+++ b/packages/instance-steps/src/metadata/components.js
@@ -49,6 +49,7 @@ export default ({
             }
             editor={Editor}
             disabled={disabled}
+            shadow={false}
           />
           {addOpen || index !== metadata.length - 1 ? (
             <Margin bottom={2} />
diff --git a/packages/instance-steps/src/metadata/index.js b/packages/instance-steps/src/metadata/index.js
index 6e03b2f6..22786a39 100644
--- a/packages/instance-steps/src/metadata/index.js
+++ b/packages/instance-steps/src/metadata/index.js
@@ -90,6 +90,7 @@ const Metadata = ({
                     onCancel={() => handleChangeAddOpen(false)}
                     editor={Editor}
                     expanded
+                    shadow={false}
                   />
                 </Fragment>
               ) : (
@@ -108,7 +109,7 @@ const Metadata = ({
                     </FlexItem>
                     <FlexItem>
                       <Button type="button" component={Link} to={next}>
-                        Save
+                        Next
                       </Button>
                     </FlexItem>
                   </Flex>
diff --git a/packages/instance-steps/src/name/index.js b/packages/instance-steps/src/name/index.js
index 1eebb5e9..b5169d6a 100644
--- a/packages/instance-steps/src/name/index.js
+++ b/packages/instance-steps/src/name/index.js
@@ -110,7 +110,7 @@ const Name = ({
                 </FormGroup>
                 <Margin top="5">
                   <Button type="button" component={Link} to={next}>
-                    Save
+                    Next
                   </Button>
                 </Margin>
               </form>
diff --git a/packages/instance-steps/src/network/index.js b/packages/instance-steps/src/network/index.js
index 9e68578b..84d5e45f 100644
--- a/packages/instance-steps/src/network/index.js
+++ b/packages/instance-steps/src/network/index.js
@@ -114,7 +114,7 @@ const Network = ({
                   </Form>
                   <Margin top="5">
                     <Button type="button" component={Link} to={next}>
-                      Save
+                      Next
                     </Button>
                   </Margin>
                 </Fragment>
diff --git a/packages/instance-steps/src/package/index.js b/packages/instance-steps/src/package/index.js
index 2c45dd4f..f49802e5 100644
--- a/packages/instance-steps/src/package/index.js
+++ b/packages/instance-steps/src/package/index.js
@@ -105,7 +105,7 @@ const PackageComponent = ({
                     </Packages>
                     <Margin top="4">
                       <Button type="button" component={Link} to={next}>
-                        Save
+                        Next
                       </Button>
                     </Margin>
                   </Fragment>
diff --git a/packages/instance-steps/src/tags/index.js b/packages/instance-steps/src/tags/index.js
index bedaca9e..940f22ac 100644
--- a/packages/instance-steps/src/tags/index.js
+++ b/packages/instance-steps/src/tags/index.js
@@ -137,7 +137,7 @@ const TagsContainer = ({
                 </FlexItem>
                 <FlexItem>
                   <Button type="button" component={Link} to={next}>
-                    Save
+                    Next
                   </Button>
                 </FlexItem>
               </Flex>
diff --git a/packages/instance-steps/src/user-script/index.js b/packages/instance-steps/src/user-script/index.js
index 135df15a..627c42fb 100644
--- a/packages/instance-steps/src/user-script/index.js
+++ b/packages/instance-steps/src/user-script/index.js
@@ -55,7 +55,7 @@ const UserScript = ({
                 <UserScriptForm {...props} />
                 <Margin top={5}>
                   <Button type="button" component={Link} to={next}>
-                    Save
+                    Next
                   </Button>
                 </Margin>
               </Fragment>
diff --git a/packages/ui-toolkit/src/key-value/index.js b/packages/ui-toolkit/src/key-value/index.js
index 150544ee..ccf2bd55 100644
--- a/packages/ui-toolkit/src/key-value/index.js
+++ b/packages/ui-toolkit/src/key-value/index.js
@@ -189,6 +189,7 @@ export const KeyValue = ({
   onlyValue = false,
   noRemove = false,
   borderless = false,
+  shadow = true,
   customHeader,
   headless = false
 }) => {
@@ -200,7 +201,7 @@ export const KeyValue = ({
       actionable={Boolean(handleHeaderClick)}
       borderless={borderless}
       headless={headless}
-      shadow
+      shadow={shadow}
     >
       {headless ? null : (
         <Header