diff --git a/templates/personal.php b/templates/personal.php
index f7225292..330d56e4 100644
--- a/templates/personal.php
+++ b/templates/personal.php
@@ -1,7 +1,7 @@
 <fieldset class="personalblock" id="documents-personal">
-	<legend><strong><?php p($l->t('Documents')); ?></strong></legend>
+	<h2><?php p($l->t('Documents')); ?></h2>
 	<div>
-		<label for="documents-default-path"><strong><?php p($l->t('Save new documents to')) ?></strong></label>
+		<label for="documents-default-path"><?php p($l->t('Save new documents to')) ?></label>
 		<input type="text" id="documents-default-path" value="<?php p($_['savePath']) ?>" /><span class="msg"></span>
 	</div>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/templates/settings.php b/templates/settings.php
index 13cf0e05..1ae1907e 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -1,18 +1,12 @@
 <fieldset class="personalblock" id="documents">
-	<legend><strong><?php p($l->t('Documents')) ?></strong></legend>
-	<table class="nostyle">
-		<tbody><tr>
-				<td>
-					<input id="webodf-unstable" type ="checkbox"
-						   <?php if ($_['unstable'] === 'true'){ ?>
-							   checked="checked"
-						   <?php } ?>
-						   />
-					<label for="webodf-unstable">
-						<?php p($l->t('Advanced feature-set'))?>&nbsp;
-						<?php p($l->t('(Unstable)')); ?>
-					</label>
-				</td>
-			</tr>
-		</tbody></table>
+	<h2><?php p($l->t('Documents')) ?></h2>
+	<input id="webodf-unstable" type ="checkbox"
+		<?php if ($_['unstable'] === 'true'){ ?>
+			checked="checked"
+		<?php } ?>
+	/>
+	<label for="webodf-unstable">
+		<?php p($l->t('Advanced feature-set'))?>&nbsp;
+		<?php p($l->t('(Unstable)')); ?>
+	</label>
 </fieldset>