diff --git a/admin/inc/class.uiconfig.inc.php b/admin/inc/class.uiconfig.inc.php
index 105fbb1c81..9fa837b782 100644
--- a/admin/inc/class.uiconfig.inc.php
+++ b/admin/inc/class.uiconfig.inc.php
@@ -262,13 +262,14 @@ class uiconfig
 			($GLOBALS['egw']->acl->check('site_config_access',2,'admin') ? '' :
 				html::submit_button('save', 'Save').
 				html::submit_button('apply', 'Apply')));
-		$t->set_var('cancel', html::submit_button('cancel', lang('Cancel')).'</div>');
+		$t->set_var('cancel', html::submit_button('cancel', 'Cancel').'</div>');
 
 		// render the page
 		$GLOBALS['egw']->framework->render(
+			'<div id="admin-config-'.$appname.'" class="admin-config">'.
 			$t->parse('out','header').
 			$t->fp('out','body').
-			$t->fp('out','footer'),
+			$t->fp('out','footer').'</div>',
 			null,true
 		);
 	}
diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css
index d33f0709ff..02d81f0584 100755
--- a/phpgwapi/templates/idots/css/traditional.css
+++ b/phpgwapi/templates/idots/css/traditional.css
@@ -941,4 +941,12 @@ div.client_error_log tr.hidden td.stack > div {
 }
 div.client_error_log tr td.stack > div {
 	white-space: pre;
+}
+
+/**
+ * configuration
+ */
+div.admin-config form > table {
+	width: 100%;
+	padding: 5px;
 }
\ No newline at end of file