9 files changed, 15 insertions, 15 deletions
diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php
index 2d4a7cb80..ffd9b9af0 100644
--- a/views/default/usersettings/form.php
+++ b/views/default/usersettings/form.php
@@ -6,7 +6,7 @@
  * @link http://elgg.org/
  */
 
-$form_body = "<div class=\"contentWrapper user_settings\">" . elgg_view("usersettings/user") . " ";
-$form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "</p></div>";
+$form_body = elgg_view("usersettings/user");
+$form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo('save')));
 
 echo elgg_view('input/form', array('action' => "{$vars['url']}action/usersettings/save", 'body' => $form_body));
 \ No newline at end of file
diff --git a/views/default/usersettings/main.php b/views/default/usersettings/main.php
index 6d96076f8..32d6c2c51 100644
--- a/views/default/usersettings/main.php
+++ b/views/default/usersettings/main.php
@@ -10,4 +10,4 @@
  */
 
 // Description of what's going on
-echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description"))) . "</p>";
+echo elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description")));
diff --git a/views/default/usersettings/main_opt/plugins.php b/views/default/usersettings/main_opt/plugins.php
index 210096e92..2b6793386 100644
--- a/views/default/usersettings/main_opt/plugins.php
+++ b/views/default/usersettings/main_opt/plugins.php
@@ -10,7 +10,7 @@
 
 global $CONFIG;
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('usersettings:plugins'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:plugins:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p>
diff --git a/views/default/usersettings/main_opt/statistics.php b/views/default/usersettings/main_opt/statistics.php
index ca9d2d2bb..bbb4fc64d 100644
--- a/views/default/usersettings/main_opt/statistics.php
+++ b/views/default/usersettings/main_opt/statistics.php
@@ -8,7 +8,7 @@
  * @link http://elgg.org/
  */
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('usersettings:statistics'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:statistics:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/statistics/"; ?>"><?php echo elgg_echo('usersettings:statistics:opt:linktext'); ?></a></p>
diff --git a/views/default/usersettings/main_opt/user.php b/views/default/usersettings/main_opt/user.php
index 92b09cae0..369fc7bd3 100644
--- a/views/default/usersettings/main_opt/user.php
+++ b/views/default/usersettings/main_opt/user.php
@@ -8,7 +8,7 @@
  * @link http://elgg.org/
  */
 ?>
-<div class="admin-menu-option">
+<div class="menu_admin_option">
 	<h2><?php echo elgg_echo('usersettings:user'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:user:opt:description'); ?><br />
 	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/user/"; ?>"><?php echo elgg_echo('usersettings:user:opt:linktext'); ?></a></p>
diff --git a/views/default/usersettings/plugins.php b/views/default/usersettings/plugins.php
index 95a856850..8c873a9de 100644
--- a/views/default/usersettings/plugins.php
+++ b/views/default/usersettings/plugins.php
@@ -9,7 +9,7 @@
  */
 
 // Description of what's going on
-echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))) . "</div>";
+echo elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description")));
 
 $limit = get_input('limit', 10);
 $offset = get_input('offset', 0);
diff --git a/views/default/usersettings/plugins_opt/plugin.php b/views/default/usersettings/plugins_opt/plugin.php
index c27212887..d32e44283 100644
--- a/views/default/usersettings/plugins_opt/plugin.php
+++ b/views/default/usersettings/plugins_opt/plugin.php
@@ -25,12 +25,12 @@ if ($user_guid) {
 
 if (elgg_view("usersettings/{$plugin}/edit")) {
 ?>
-<div class="contentWrapper">
-	<h3 class="settings"><?php echo elgg_echo($plugin); ?></h3>
-
+<div class="user_settings">
+	<h3><?php echo elgg_echo($plugin); ?></h3>
+	
 	<div id="<?php echo $plugin; ?>_settings">
 		<?php echo elgg_view("object/plugin", array('plugin' => $plugin, 'entity' => find_plugin_usersettings($plugin, $user_guid), 'prefix' => 'user')) ?>
 	</div>
-</div>
+</div>	
 <?php
 }
 \ No newline at end of file
diff --git a/views/default/usersettings/statistics_opt/numentities.php b/views/default/usersettings/statistics_opt/numentities.php
index cf1d8598b..1c4b127ec 100644
--- a/views/default/usersettings/statistics_opt/numentities.php
+++ b/views/default/usersettings/statistics_opt/numentities.php
@@ -13,9 +13,9 @@ $entity_stats = get_entity_statistics($_SESSION['user']->guid);
 
 if ($entity_stats) {
 ?>
-<div class="usersettings_statistics">
+<div class="user_settings statistics">
 	<h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3>
-	<table>
+	<table class="styled">
 		<?php
 			foreach ($entity_stats as $k => $entry) {
 				foreach ($entry as $a => $b) {
diff --git a/views/default/usersettings/statistics_opt/online.php b/views/default/usersettings/statistics_opt/online.php
index 2ea9bef28..817b18cde 100644
--- a/views/default/usersettings/statistics_opt/online.php
+++ b/views/default/usersettings/statistics_opt/online.php
@@ -18,10 +18,10 @@ if ($log) {
 }
 
 ?>
-<div class="usersettings_statistics">
+<div class="user_settings details">
 	<h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3>
 
-	<table>
+	<table class="styled">
 		<tr class="odd"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr>
 		<tr class="even"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr>
 		<tr class="odd"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:membersince'); ?></td><td><?php echo date("r",$user->time_created); ?></td></tr>