diff --git a/payment/uc_payment_pack/uc_payment_pack.admin.inc b/payment/uc_payment_pack/uc_payment_pack.admin.inc
index 7054690..341ab8d 100644
--- a/payment/uc_payment_pack/uc_payment_pack.admin.inc
+++ b/payment/uc_payment_pack/uc_payment_pack.admin.inc
@@ -36,15 +36,12 @@ function uc_payment_pack_receive_check_form($form, &$form_state, $order) {
   $form['clear'] = array(
     '#type' => 'fieldset',
     '#title' => t('Expected clear date'),
-    '#collapsible' => FALSE,
+    '#attributes' => array('class' => array('uc-inline-form', 'clearfix')),
   );
   $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/shipping/uc_shipping/uc_shipping.admin.inc b/shipping/uc_shipping/uc_shipping.admin.inc
index 55adf70..868dd4b 100644
--- a/shipping/uc_shipping/uc_shipping.admin.inc
+++ b/shipping/uc_shipping/uc_shipping.admin.inc
@@ -741,7 +741,6 @@ function uc_shipping_shipment_view($order, $shipment) {
  *
  * @see uc_shipping_shipment_edit_validate()
  * @see uc_shipping_shipment_edit_submit()
- * @see theme_uc_shipping_package_dimensions()
  * @ingroup forms
  */
 function uc_shipping_shipment_edit($form, &$form_state, $order, $shipment) {
@@ -814,9 +813,9 @@ function uc_shipping_shipment_edit($form, &$form_state, $order, $shipment) {
     );
     $pkg_form['weight'] = array(
       '#type'        => 'container',
+      '#attributes'  => array('class' => array('uc-inline-form', 'clearfix')),
       '#description' => t('Weight of the package. Default value is sum of product weights in the package.'),
       '#weight'      => 15,
-      '#theme'       => 'uc_product_inline_form',
     );
     $pkg_form['weight']['weight'] = array(
       '#type'          => 'textfield',
@@ -840,11 +839,10 @@ function uc_shipping_shipment_edit($form, &$form_state, $order, $shipment) {
     );
     $pkg_form['dimensions'] = array(
       '#type'        => 'container',
+      '#attributes'  => array('class' => array('uc-inline-form', 'clearfix')),
       '#title'       => t('Dimensions'),
       '#description' => t('Physical dimensions of the packaged product.'),
       '#weight'      => 20,
-      //'#theme'       => 'uc_shipping_package_dimensions',
-      '#theme'       => 'uc_product_inline_form',
     );
     $pkg_form['dimensions']['length'] = array(
       '#type'          => 'textfield',
diff --git a/shipping/uc_shipping/uc_shipping.module b/shipping/uc_shipping/uc_shipping.module
index afd5fe5..d8319fe 100644
--- a/shipping/uc_shipping/uc_shipping.module
+++ b/shipping/uc_shipping/uc_shipping.module
@@ -203,9 +203,6 @@ function uc_shipping_theme() {
       'render element' => 'form',
       'file' => 'uc_shipping.admin.inc',
     ),
-    'uc_shipping_package_dimensions' => array(
-      'render element' => 'form',
-    ),
     'uc_shipping_shipment_print' => array(
       'variables' => array('order' => NULL, 'shipment' => NULL, 'labels' => TRUE),
     ),
@@ -381,26 +378,6 @@ function uc_shipping_package_view($package) {
   return $build;
 }
 
-/**
- * Displays length, width, and height fields on one line.
- *
- * @param $variables
- *   An associative array containing:
- *   - form: A render element representing the form.
- *
- * @ingroup themeable
- */
-function theme_uc_shipping_package_dimensions($variables) {
-  $form = $variables['form'];
-
-  $row = array();
-  foreach (element_children($form) as $dimension) {
-    $row[] = drupal_render($form[$dimension]);
-  }
-
-  return theme('table', array('rows' => array($row)));
-}
-
 /******************************************************************************
  * Module and helper functions                                                *
  ******************************************************************************/
diff --git a/shipping/uc_ups/uc_ups.ship.inc b/shipping/uc_ups/uc_ups.ship.inc
index 24a18ff..511be6f 100644
--- a/shipping/uc_ups/uc_ups.ship.inc
+++ b/shipping/uc_ups/uc_ups.ship.inc
@@ -79,9 +79,9 @@ function uc_ups_fulfill_order($form, &$form_state, $order, $package_ids) {
       );
       $pkg_form['weight'] = array(
         '#type'           => 'container',
+        '#attributes'     => array('class' => array('uc-inline-form', 'clearfix')),
         '#description'    => t('Weight of the package. Default value is sum of product weights in the package.'),
         '#weight'         => 15,
-        '#theme'          => 'uc_product_inline_form',
       );
       $pkg_form['weight']['weight'] = array(
         '#type'          => 'textfield',
@@ -105,9 +105,9 @@ function uc_ups_fulfill_order($form, &$form_state, $order, $package_ids) {
       );
       $pkg_form['dimensions'] = array(
         '#type'          => 'container',
+        '#attributes'    => array('class' => array('uc-inline-form', 'clearfix')),
         '#description'   => t('Physical dimensions of the package.'),
         '#weight'        => 20,
-        '#theme'         => 'uc_product_inline_form',
       );
       $pkg_form['dimensions']['length'] = array(
         '#type'          => 'textfield',
diff --git a/uc_cart/uc_cart.admin.inc b/uc_cart/uc_cart.admin.inc
index faba830..20079b4 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'),
+    '#attributes' => array('class' => array('uc-inline-form', 'clearfix')),
   );
   $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'),
+    '#attributes' => array('class' => array('uc-inline-form', 'clearfix')),
   );
   $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..9531692 100644
--- a/uc_product/uc_product.css
+++ b/uc_product/uc_product.css
@@ -27,32 +27,6 @@
   margin-right: 2em;
 }
 
-.node-form .product-field table {
-  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;
-}
-
 #products-selector table {
   margin: 0em 0em;
 }
diff --git a/uc_product/uc_product.module b/uc_product/uc_product.module
index e0ad852..1bbab71 100644
--- a/uc_product/uc_product.module
+++ b/uc_product/uc_product.module
@@ -206,9 +206,6 @@ function uc_product_feature_access($node) {
  */
 function uc_product_theme() {
   return array(
-    'uc_product_inline_form' => array(
-      'render element' => 'form',
-    ),
     'uc_product_model' => array(
       'variables' => array('model' => '', 'view_mode' => 'full'),
     ),
@@ -344,7 +341,6 @@ function uc_product_edit_access($node) {
 /**
  * Implements hook_form().
  *
- * @see theme_uc_product_inline_form()
  * @ingroup forms
  */
 function uc_product_form($node, $form_state) {
@@ -385,8 +381,8 @@ function uc_product_form($node, $form_state) {
 
   $form['base']['prices'] = array(
     '#type' => 'container',
+    '#attributes' => array('class' => array('uc-inline-form', 'clearfix')),
     '#weight' => 5,
-    '#theme' => 'uc_product_inline_form',
   );
 
   $form['base']['prices']['list_price'] = array(
@@ -421,13 +417,13 @@ function uc_product_form($node, $form_state) {
 
   $form['base']['weight'] = array(
     '#type' => 'container',
+    '#attributes' => array('class' => array('uc-inline-form', 'clearfix')),
     '#states' => array(
       'invisible' => array(
         'input[name="shippable"]' => array('checked' => FALSE),
       ),
     ),
     '#weight' => 15,
-    '#theme' => 'uc_product_inline_form',
   );
   $form['base']['weight']['weight'] = array(
     '#type' => 'textfield',
@@ -451,13 +447,13 @@ function uc_product_form($node, $form_state) {
 
   $form['base']['dimensions'] = array(
     '#type' => 'container',
+    '#attributes' => array('class' => array('uc-inline-form', 'clearfix')),
     '#states' => array(
       'invisible' => array(
         'input[name="shippable"]' => array('checked' => FALSE),
       ),
     ),
     '#weight' => 20,
-    '#theme' => 'uc_product_inline_form',
   );
   $form['base']['dimensions']['dim_length'] = array(
     '#type' => 'textfield',
@@ -534,27 +530,6 @@ function uc_product_form($node, $form_state) {
 }
 
 /**
- * Puts form fields on the same line.
- *
- * @param $variables
- *   An associative array containing:
- *   - form: A render element representing the form.
- *
- * @ingroup themeable
- */
-function theme_uc_product_inline_form($variables) {
-  $form = $variables['form'];
-
-  $output = '<table><tr>';
-  foreach (element_children($form) as $element) {
-    $output .= '<td>' . drupal_render($form[$element]) . '</td>';
-  }
-  $output .= '</tr></table>';
-
-  return $output;
-}
-
-/**
  * Implements hook_prepare().
  */
 function uc_product_prepare($node) {
diff --git a/uc_store/uc_store.css b/uc_store/uc_store.css
index ea8df3b..5d2b2f4 100644
--- a/uc_store/uc_store.css
+++ b/uc_store/uc_store.css
@@ -7,6 +7,12 @@
   white-space: nowrap;
 }
 
+.uc-inline-form .form-item {
+  float: left;
+  margin-right: 1em;
+  padding-top: 5px;
+}
+
 .uc-customer-table tbody tr:hover,
 .uc-cust-orders-table tbody tr:hover {
   background-color: #ddd;