diff --git a/assets/javascripts/wizard/templates/components/wizard-field.hbs b/assets/javascripts/wizard/templates/components/wizard-field.hbs
index cb03a5bc..ffbf9139 100644
--- a/assets/javascripts/wizard/templates/components/wizard-field.hbs
+++ b/assets/javascripts/wizard/templates/components/wizard-field.hbs
@@ -2,16 +2,16 @@
   {{#if field.label}}
     <span class='label-value'>{{field.label}}</span>
   {{/if}}
-
-  {{#if field.image}}
-    <div class="field-image"><img src="{{field.image}}"></div>
-  {{/if}}
-
-  {{#if field.description}}
-    <div class='field-description'>{{cookedDescription}}</div>
-  {{/if}}
 </label>
 
+{{#if field.image}}
+  <div class="field-image"><img src="{{field.image}}"></div>
+{{/if}}
+
+{{#if field.description}}
+  <div class='field-description'>{{cookedDescription}}</div>
+{{/if}}
+
 {{#if inputComponentName}}
   <div class='input-area'>
     {{component inputComponentName field=field step=step fieldClass=fieldClass wizard=wizard}}
diff --git a/assets/stylesheets/wizard/wizard_custom.scss b/assets/stylesheets/wizard/wizard_custom.scss
index ddfcc3dc..0d166d70 100644
--- a/assets/stylesheets/wizard/wizard_custom.scss
+++ b/assets/stylesheets/wizard/wizard_custom.scss
@@ -151,11 +151,6 @@
     display: flex;
     align-items: center;
 
-    &> label {
-      order: 1;
-      flex: 1;
-    }
-
     &> .input-area {
       order: 0;
       margin: 15px 20px !important;
@@ -165,6 +160,16 @@
         transform: scale(1.3);
       }
     }
+
+    &> label {
+      order: 1;
+    }
+
+    &> .field-description {
+      margin-top: 0;
+      margin-left: 10px;
+      order: 2;
+    }
   }
 
   .control-group {
@@ -191,6 +196,10 @@
     margin: 20px 0;
   }
 
+  .wizard-image-row .wizard-btn-upload {
+    margin: 0;
+  }
+
   .wizard-column .wizard-field .input-area {
     margin: 0.5em 0;
   }