diff --git a/scss/components/_array-input.scss b/scss/components/_array-input.scss
index 73dc8950..c7eae8d9 100644
--- a/scss/components/_array-input.scss
+++ b/scss/components/_array-input.scss
@@ -41,13 +41,25 @@
 
   &-toolbar {
     margin-top: $gap-sm;
+
+    &--dnd {
+      padding-left: 29px;
+    }
+
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+
+  &-sortTip {
+    color: $text--muted-color;
   }
 
   &-item {
     display: flex;
     flex-direction: row;
     align-items: flex-start;
-    margin-bottom: $gap-sm;
+    margin-bottom: $gap-xs;
 
     > div {
       flex-grow: 1;
diff --git a/src/components/ArrayInput.tsx b/src/components/ArrayInput.tsx
index b0ad9adb..f416a101 100644
--- a/src/components/ArrayInput.tsx
+++ b/src/components/ArrayInput.tsx
@@ -194,7 +194,14 @@ export class ArrayInput extends React.Component<ArrayInputProps> {
           <div className={cx('ArrayInput-placeholder')}>{__(placeholder)}</div>
         )}
 
-        <div className={cx('ArrayInput-toolbar')}>
+        <div
+          className={cx(
+            'ArrayInput-toolbar',
+            sortable && Array.isArray(value) && value.length > 1
+              ? 'ArrayInput-toolbar--dnd'
+              : ''
+          )}
+        >
           {!Array.isArray(value) || !maxLength || value.length < maxLength ? (
             <Button
               className={cx('ArrayInput-addBtn')}
@@ -208,7 +215,7 @@ export class ArrayInput extends React.Component<ArrayInputProps> {
           ) : null}
 
           {sortable && Array.isArray(value) && value.length ? (
-            <span className={cx(`Combo-dragableTip`)} ref={this.dragTipRef}>
+            <span className={cx(`ArrayInput-sortTip`)} ref={this.dragTipRef}>
               {Array.isArray(value) && value.length > 1 ? __(sortTip) : ''}
             </span>
           ) : null}
diff --git a/src/components/NumberInput.tsx b/src/components/NumberInput.tsx
index 94ab09e0..dc141b69 100644
--- a/src/components/NumberInput.tsx
+++ b/src/components/NumberInput.tsx
@@ -30,7 +30,8 @@ export class NumberInput extends React.Component<NumberProps, any> {
       max,
       min,
       disabled,
-      placeholder
+      placeholder,
+      onChange
     } = this.props;
 
     let precisionProps: any = {};
@@ -47,7 +48,7 @@ export class NumberInput extends React.Component<NumberProps, any> {
         step={step}
         max={max}
         min={min}
-        onChange={onchange}
+        onChange={onChange}
         disabled={disabled}
         placeholder={placeholder}
         {...precisionProps}