diff --git a/payment/uc_payment_pack/uc_payment_pack.admin.inc b/payment/uc_payment_pack/uc_payment_pack.admin.inc
index 7054690..1b527c1 100644
--- a/payment/uc_payment_pack/uc_payment_pack.admin.inc
+++ b/payment/uc_payment_pack/uc_payment_pack.admin.inc
@@ -37,14 +37,11 @@ function uc_payment_pack_receive_check_form($form, &$form_state, $order) {
     '#type' => 'fieldset',
     '#title' => t('Expected clear date'),
     '#collapsible' => FALSE,
+    '#theme' => 'uc_product_inline_form',
   );
   $form['clear']['clear_month'] = uc_select_month(NULL, format_date(REQUEST_TIME, 'custom', 'n'));
   $form['clear']['clear_day'] = uc_select_day(NULL, format_date(REQUEST_TIME, 'custom', 'j'));
   $form['clear']['clear_year'] = uc_select_year(NULL, format_date(REQUEST_TIME, 'custom', 'Y'), format_date(REQUEST_TIME, 'custom', 'Y'), format_date(REQUEST_TIME, 'custom', 'Y') + 1);
-  foreach (array('clear_month', 'clear_day', 'clear_year') as $key) {
-    $form['clear'][$key]['#prefix'] = '<div style="float: left; margin-right: 1em;">';
-    $form['clear'][$key]['#suffix'] = '</div>';
-  }
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
diff --git a/uc_cart/uc_cart.admin.inc b/uc_cart/uc_cart.admin.inc
index faba830..5df8d93 100644
--- a/uc_cart/uc_cart.admin.inc
+++ b/uc_cart/uc_cart.admin.inc
@@ -97,14 +97,13 @@ function uc_cart_cart_settings_form($form, &$form_state) {
   $form['lifetime']['anonymous'] = array(
     '#type' => 'fieldset',
     '#title' => t('Anonymous users'),
+    '#theme' => 'uc_product_inline_form',
   );
   $form['lifetime']['anonymous']['uc_cart_anon_duration'] = array(
     '#type' => 'select',
     '#title' => t('Duration'),
     '#options' => drupal_map_assoc(range(1, 60)),
     '#default_value' => variable_get('uc_cart_anon_duration', '4'),
-    '#prefix' => '<div style="float: left; margin-right: 1em; padding-top: 0;">',
-    '#suffix' => '</div>',
   );
   $form['lifetime']['anonymous']['uc_cart_anon_unit'] = array(
     '#type' => 'select',
@@ -117,21 +116,18 @@ function uc_cart_cart_settings_form($form, &$form_state) {
       'years' => t('Year(s)'),
     ),
     '#default_value' => variable_get('uc_cart_anon_unit', 'hours'),
-    '#prefix' => '<div style="float: left; margin-right: 1em;">',
-    '#suffix' => '</div>',
   );
 
   $form['lifetime']['authenticated'] = array(
     '#type' => 'fieldset',
     '#title' => t('Authenticated users'),
+    '#theme' => 'uc_product_inline_form',
   );
   $form['lifetime']['authenticated']['uc_cart_auth_duration'] = array(
     '#type' => 'select',
     '#title' => t('Duration'),
     '#options' => drupal_map_assoc(range(1, 60)),
     '#default_value' => variable_get('uc_cart_auth_duration', '1'),
-    '#prefix' => '<div style="float: left; margin-right: 1em; padding-top: 0;">',
-    '#suffix' => '</div>',
   );
   $form['lifetime']['authenticated']['uc_cart_auth_unit'] = array(
     '#type' => 'select',
@@ -143,8 +139,6 @@ function uc_cart_cart_settings_form($form, &$form_state) {
       'years' => t('Year(s)'),
     ),
     '#default_value' => variable_get('uc_cart_auth_unit', 'years'),
-    '#prefix' => '<div style="float: left; margin-right: 1em;">',
-    '#suffix' => '</div>',
   );
 
   $form['continue_shopping'] = array(
diff --git a/uc_product/uc_product.css b/uc_product/uc_product.css
index 972bcf1..3200788 100644
--- a/uc_product/uc_product.css
+++ b/uc_product/uc_product.css
@@ -27,30 +27,15 @@
   margin-right: 2em;
 }
 
-.node-form .product-field table {
+.uc-inline-form {
   border: 0;
   margin: 0;
   width: auto;
 }
 
-.node-form .product-field td {
-  border: 0;
-  padding: 3px 6px 0 0;
-}
-
-.node-form .product-field tbody {
-  border: none;
-  margin: 0;
-}
-
-.node-form .product-field table .form-item {
-  margin-bottom: 0;
-  margin-top: 0;
-}
-
-.node-form .product-field .form-text {
-  display: inline;
-  width: auto;
+.uc-inline-form td {
+  border: 0 !important;
+  padding: 0 1em 0 0;
 }
 
 #products-selector table {
diff --git a/uc_product/uc_product.module b/uc_product/uc_product.module
index e0ad852..932ea8d 100644
--- a/uc_product/uc_product.module
+++ b/uc_product/uc_product.module
@@ -545,7 +545,7 @@ function uc_product_form($node, $form_state) {
 function theme_uc_product_inline_form($variables) {
   $form = $variables['form'];
 
-  $output = '<table><tr>';
+  $output = '<table class="uc-inline-form"><tr>';
   foreach (element_children($form) as $element) {
     $output .= '<td>' . drupal_render($form[$element]) . '</td>';
   }