diff --git a/includes/commerce_product.inline_entity_form.inc b/includes/commerce_product.inline_entity_form.inc
index b5f75e9..627818a 100644
--- a/includes/commerce_product.inline_entity_form.inc
+++ b/includes/commerce_product.inline_entity_form.inc
@@ -12,7 +12,7 @@ class CommerceProductInlineEntityFormController extends EntityInlineEntityFormCo
    */
   public function css() {
     return array(
-      'base' => drupal_get_path('module', 'inline_entity_form') . '/includes/entity_types/commerce-product.css',
+      'base' => drupal_get_path('module', 'inline_entity_form') . '/theme/commerce-product.css',
     );
   }
 
diff --git a/inline_entity_form.module b/inline_entity_form.module
index ecfe927..393cb26 100644
--- a/inline_entity_form.module
+++ b/inline_entity_form.module
@@ -290,13 +290,6 @@ function inline_entity_form_field_widget_form(&$form, &$form_state, $field, $ins
   }
   else {
     $element['#element_validate'] = array('inline_entity_form_save_row_weights');
-    // Add description text to the widget.
-    if (empty($form_state['inline_entity_form'][$ief_id]['entities'])) {
-      $element['#description'] = t('No @type_plural have been created.', array('@type_plural' => $labels['plural']));
-      if ($instance['required']) {
-        $element['#description'] .= ' ' . t('At least one @type_singular is required.', array('@type_singular' => $labels['singular']));
-      }
-    }
 
     $element['entities'] = array(
       '#tree' => TRUE,
@@ -329,7 +322,7 @@ function inline_entity_form_field_widget_form(&$form, &$form_state, $field, $ins
         );
         $element['entities'][$key]['form'] = array(
           '#type' => 'container',
-          '#attributes' => array('class' => array('inline-entity-form-title')),
+          '#attributes' => array('class' => array('ief-form', 'ief-form-row')),
           '#op' => $value['form'],
           // Used by Field API and controller methods to find the relevant
           // values in $form_state.
@@ -441,6 +434,7 @@ function inline_entity_form_field_widget_form(&$form, &$form_state, $field, $ins
       // There's a form open, show it.
       $element['form'] = array(
         '#type' => 'fieldset',
+        '#attributes' => array('class' => array('ief-form', 'ief-form-bottom')),
         // Identifies the IEF widget to which the form belongs.
         '#ief_id' => $ief_id,
         // Used by Field API and controller methods to find the relevant
@@ -460,6 +454,12 @@ function inline_entity_form_field_widget_form(&$form, &$form_state, $field, $ins
           $element['form']['actions']['ief_add_cancel']['#access'] = FALSE;
         }
       }
+
+      // No entities have been added. Remove the outer fieldset to reduce
+      // visual noise caused by having two titles.
+      if (empty($form_state['inline_entity_form'][$ief_id]['entities'])) {
+        $element['#type'] = 'container';
+      }
     }
   }
 
diff --git a/theme/commerce-product.css b/theme/commerce-product.css
index d56e118..751f1c8 100644
--- a/theme/commerce-product.css
+++ b/theme/commerce-product.css
@@ -1,4 +1,7 @@
 
+.ief-product-attributes .fieldset-wrapper {
+  margin-top: 15px;
+}
 .ief-product-attributes .fieldset-wrapper > div {
   margin-right: 20px;
 }
@@ -6,3 +9,7 @@
 .ief-product-details .field-type-commerce-price .form-item {
   margin-right: 15px;
 }
+.ief-product-details .form-item label {
+  float: left;
+  margin-right: 10px;
+}
diff --git a/theme/inline_entity_form.seven.css b/theme/inline_entity_form.seven.css
index 4d66dbb..7e77e95 100644
--- a/theme/inline_entity_form.seven.css
+++ b/theme/inline_entity_form.seven.css
@@ -6,18 +6,22 @@
   border-bottom: 1px solid #ccc !important;
 }
 
-.ief-entity-fieldset {
-  border: 0 !important;
+.field-widget-inline-entity-form fieldset.form-wrapper {
+  border: 0;
 }
 .ief-entity-fieldset, .ief-entity-fieldset fieldset {
   background-color: white !important;
 }
+.ief-form > .fieldset-wrapper {
+  border: 1px solid #ccc !important;
+}
 .ief-entity-fieldset > legend span.fieldset-legend {
-  width: 99%;
-  background-color: #E7E7E7;
-  height: 25px;
-  padding: 5px 0 3px 15px;
+  width: 100%;
+  font-weight: 600;
+  margin-top: 10px;
+  padding: 3px 0;
+  border-bottom: 1px solid #E4E4E4;
 }
 .ief-entity-fieldset > .fieldset-wrapper {
-  margin-top: 15px;
+  margin-top: 5px;
 }