diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bf7950f5..40a2fda1 100755
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -10,6 +10,7 @@ not yet released
 * #75: Test mode for email and SMS settings.
 * #82: Added Danish translation.
 * #83: Invalid redirect after switching languages and logging in.
+* #86: Different design styles on status page (list, table).
 * Support for Danish SMS provider Smsit <http://www.smsit.dk/>
 * Composer added for dependencies.
 
diff --git a/src/psm/Service/User.class.php b/src/psm/Service/User.class.php
index 7996d8aa..879f619b 100644
--- a/src/psm/Service/User.class.php
+++ b/src/psm/Service/User.class.php
@@ -452,7 +452,7 @@ class User {
 			}
 
 			$this->user_preferences = array();
-			foreach($this->db_connection->query('SELECT * FROM ' . PSM_DB_PREFIX . 'users_preferences WHERE user_id = ' . $this->user_id) as $row) {
+			foreach($this->db_connection->query('SELECT `key`,`value` FROM `' . PSM_DB_PREFIX . 'users_preferences` WHERE `user_id` = ' . $this->user_id) as $row) {
 				$this->user_preferences[$row['key']] = $row['value'];
 			}
 		}
@@ -486,9 +486,9 @@ class User {
 				if($this->user_preferences[$key] == $value) {
 					return;		// no change
 				}
-				$sql = 'UPDATE ' . PSM_DB_PREFIX . 'users_preferences SET `key` = ?, `value` = ? WHERE `user_id` = ?';
+				$sql = 'UPDATE `' . PSM_DB_PREFIX . 'users_preferences` SET `key` = ?, `value` = ? WHERE `user_id` = ?';
 			} else{
-				$sql = 'INSERT INTO ' . PSM_DB_PREFIX . 'users_preferences SET `key` = ?, `value` = ?, `user_id` = ?';
+				$sql = 'INSERT INTO `' . PSM_DB_PREFIX . 'users_preferences` SET `key` = ?, `value` = ?, `user_id` = ?';
 			}
 			$sth = $this->db_connection->prepare($sql);
 			$sth->execute(array($key, $value, $this->user_id));
diff --git a/src/psm/Util/Install/Installer.class.php b/src/psm/Util/Install/Installer.class.php
index 681b2562..9b8deab7 100644
--- a/src/psm/Util/Install/Installer.class.php
+++ b/src/psm/Util/Install/Installer.class.php
@@ -181,6 +181,12 @@ class Installer {
 							PRIMARY KEY (`user_id`),
 							UNIQUE KEY `unique_username` (`user_name`)
 						  ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;",
+			PSM_DB_PREFIX . 'users_preferences' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "users_preferences` (
+							`user_id` int(11) unsigned NOT NULL,
+							`key` varchar(255) NOT NULL,
+							`value` varchar(255) NOT NULL,
+							PRIMARY KEY (`user_id`, `key`)
+						  ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
 			PSM_DB_PREFIX . 'users_servers' => "CREATE TABLE `" . PSM_DB_PREFIX . "users_servers` (
 							`user_id` INT( 11 ) UNSIGNED NOT NULL ,
 							`server_id` INT( 11 ) UNSIGNED NOT NULL ,
@@ -389,7 +395,7 @@ class Installer {
 						`user_id` int(11) unsigned NOT NULL,
 						`key` varchar(255) NOT NULL,
 						`value` varchar(255) NOT NULL,
-						PRIMARY KEY (`user_id`)
+						PRIMARY KEY (`user_id`, `key`)
 					  ) ENGINE=MyISAM DEFAULT CHARSET=utf8;";
 		$this->execSQL($queries);
 	}
diff --git a/static/css/style.css b/static/css/style.css
index c81b9de4..47689d54 100755
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -123,7 +123,7 @@ fieldset {
 }
 .tight {
 	width: 10px;
-	white-space: nowrap;	
+	white-space: nowrap;
 }
 .nowrap {
 	white-space: nowrap;
@@ -237,6 +237,9 @@ legend {
 	padding: 6px 8px;
 	vertical-align: middle;
 }
+.row-offline, .row-online {
+	cursor: pointer;
+}
 .row-offline td, .row-offline tr:hover td {
 	background: #a00000 !important;
 	color: #f7cece;