diff --git a/packages/my-joy-beta/src/components/create-instance/affinity.js b/packages/my-joy-beta/src/components/create-instance/affinity.js
index 6bc96e19..e5083797 100644
--- a/packages/my-joy-beta/src/components/create-instance/affinity.js
+++ b/packages/my-joy-beta/src/components/create-instance/affinity.js
@@ -37,8 +37,8 @@ export const Rule = rule => (
           width={remcalc(66)}
           embedded
         >
-          <option value="must">must</option>
           <option value="should">should</option>
+          <option value="must">must</option>
         </Select>
       </FormGroup>
       <H5 style={style} inline noMargin>
@@ -48,7 +48,7 @@ export const Rule = rule => (
         <Select
           style={style}
           touched={rule['rule-instance-placement']}
-          width={remcalc(90)}
+          width={remcalc(100)}
           embedded
         >
           <option value="same">the same</option>
@@ -62,7 +62,7 @@ export const Rule = rule => (
         <Select
           style={style}
           touched={rule['rule-type']}
-          width={remcalc(120)}
+          width={remcalc(135)}
           embedded
           left
         >
diff --git a/packages/my-joy-beta/src/containers/create-instance/affinity.js b/packages/my-joy-beta/src/containers/create-instance/affinity.js
index b812a22e..e9227555 100644
--- a/packages/my-joy-beta/src/containers/create-instance/affinity.js
+++ b/packages/my-joy-beta/src/containers/create-instance/affinity.js
@@ -124,7 +124,7 @@ export const Affinity = ({
     </ReduxForm>
     {expanded ? (
       <Margin top={2} bottom={4}>
-        {affinityRules.length === 0 ? (
+        {!addOpen && affinityRules.length === 0 ? (
           <Button
             type="button"
             onClick={() => handleChangeAddOpen(true)}
diff --git a/packages/my-joy-beta/src/containers/create-instance/index.js b/packages/my-joy-beta/src/containers/create-instance/index.js
index c92b4c2b..e01263f8 100644
--- a/packages/my-joy-beta/src/containers/create-instance/index.js
+++ b/packages/my-joy-beta/src/containers/create-instance/index.js
@@ -41,6 +41,7 @@ const CREATE_FORM = 'CREATE-INSTANCE';
 
 const CreateInstance = ({
   step,
+  error,
   disabled,
   handleSubmit,
   history,