diff --git a/components/fieldset.inc b/components/fieldset.inc
index 92875b4..0b65602 100644
--- a/components/fieldset.inc
+++ b/components/fieldset.inc
@@ -19,6 +19,8 @@ function _webform_defaults_fieldset() {
       'collapsible' => 0,
       'collapsed' => 0,
       'description' => '',
+      'horizontal' => FALSE,
+      'nodecor' => FALSE,
       'private' => FALSE,
     ),
   );
@@ -45,6 +47,22 @@ function _webform_edit_fieldset($component) {
     '#weight' => 3,
     '#parents' => array('extra', 'collapsed'),
   );
+  $form['display']['nodecor'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Hide decoration'),
+    '#default_value' => $component['extra']['nodecor'],
+    '#description' => t('Hide fieldset decorations. e.g. border, padding'),
+    '#weight' => 20,
+    '#parents' => array('extra', 'nodecor'),
+  );
+  $form['display']['horizontal'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Horizontal container'),
+    '#default_value' => $component['extra']['vertical'],
+    '#description' => t('Create a horizontal container'),
+    '#weight' => 22,
+    '#parents' => array('extra', 'horizontal'),
+  );
   return $form;
 }
 
@@ -59,7 +77,8 @@ function _webform_render_fieldset($component, $value = NULL, $filter = TRUE) {
     '#description' => $filter ? _webform_filter_descriptions($component['extra']['description']) : $component['extra']['description'],
     '#collapsible' => $component['extra']['collapsible'],
     '#collapsed' => $component['extra']['collapsed'],
-    '#attributes' => array('class' => array('webform-component-fieldset'), 'id' => 'webform-component-' . $component['form_key']),
+    '#attributes' => array('class' => array('webform-component-fieldset', ($component['extra']['nodecor'] ? 'webform-container-nodecor' : ''),
+      ($component['extra']['horizontal'] ? 'webform-container-inline-block' : '') ), 'id' => 'webform-component-' . $component['form_key']),
     '#pre_render' => array('webform_fieldset_prerender'),
     '#webform_component' => $component,
   );
diff --git a/css/webform.css b/css/webform.css
index cd379d0..51fdc37 100644
--- a/css/webform.css
+++ b/css/webform.css
@@ -18,3 +18,15 @@ input.webform-calendar {
 .webform-container-inline div.description {
   display: block;
 }
+.webform-container-inline-block > div.fieldset-wrapper > * {
+  display: inline-block;
+  vertical-align: top;
+}
+
+.webform-container-nodecor,
+.webform-container-nodecor > div.fieldset-wrapper {
+  border: none;
+  padding: 0;
+  margin: 0;
+  position: static;
+}