diff --git a/views/html/characters/index.tpl b/views/html/characters/index.tpl
index 5880a076..237c20e0 100644
--- a/views/html/characters/index.tpl
+++ b/views/html/characters/index.tpl
@@ -15,15 +15,16 @@
 <?php endif ?>
 
 <form method="post">
-	<fieldset>
-		<legend><?=_('Properties')?></legend>
-		<input type="checkbox" id="username" name="properties[]" value="username" <?php if(in_array('username', $properties)) : ?>checked="checked"<?php endif ?> /><label for="username"><?=_('Username')?></label><br />
-		<input type="checkbox" id="xps" name="properties[]" value="xps" <?php if(in_array('xps', $properties)) : ?>checked="checked"<?php endif ?> /><label for="xps"><?=_('XPs')?></label><br />
-		<input type="checkbox" id="roles" name="properties[]" value="roles" <?php if(in_array('roles', $properties)) : ?>checked="checked"<?php endif ?> /><label for="roles"><?=_('Roles')?></label><br />
-		<?php foreach($characterfields as &$characterfield) : ?>
-		<input type="checkbox" id="characterfield-<?=$characterfield['url']?>" name="properties[characterfields][]" value="<?=$characterfield['url']?>" <?php if(array_key_exists('characterfields', $properties) && in_array($characterfield['url'], $properties['characterfields'])) : ?>checked="checked"<?php endif ?> /><label for="characterfield-<?=$characterfield['url']?>"><?=$characterfield['url']?></label><br />
-		<?php endforeach ?>
-		<input type="submit" name="set-properties" value="<?=_('Set properties')?>" />
+	<fieldset class="filter">
+		<ul>
+			<li><input type="checkbox" id="username" name="properties[]" value="username" <?php if(in_array('username', $properties)) : ?>checked="checked"<?php endif ?> /><label for="username"><?=_('Username')?></label></li>
+			<li><input type="checkbox" id="xps" name="properties[]" value="xps" <?php if(in_array('xps', $properties)) : ?>checked="checked"<?php endif ?> /><label for="xps"><?=_('XPs')?></label></li>
+			<li><input type="checkbox" id="roles" name="properties[]" value="roles" <?php if(in_array('roles', $properties)) : ?>checked="checked"<?php endif ?> /><label for="roles"><?=_('Roles')?></label></li>
+			<?php foreach($characterfields as &$characterfield) : ?>
+			<li><input type="checkbox" id="characterfield-<?=$characterfield['url']?>" name="properties[characterfields][]" value="<?=$characterfield['url']?>" <?php if(array_key_exists('characterfields', $properties) && in_array($characterfield['url'], $properties['characterfields'])) : ?>checked="checked"<?php endif ?> /><label for="characterfield-<?=$characterfield['url']?>"><?=$characterfield['url']?></label></li>
+			<?php endforeach ?>
+		</ul>
+		<input class="cta" type="submit" name="set-properties" value="<?=_('Set properties')?>" />
 	</fieldset>
 </form>
 
diff --git a/views/html/characters/manage.tpl b/views/html/characters/manage.tpl
index 476d7973..b3d1164d 100644
--- a/views/html/characters/manage.tpl
+++ b/views/html/characters/manage.tpl
@@ -10,18 +10,19 @@
 <h1><?=_('Manage')?></h1>
 
 <form method="post">
-	<fieldset>
-		<legend><?=_('Properties')?></legend>
-		<input type="checkbox" id="username" name="properties[]" value="username" <?php if(in_array('username', $properties)) : ?>checked="checked"<?php endif ?> /><label for="username"><?=_('Username')?></label><br />
-		<input type="checkbox" id="xps" name="properties[]" value="xps" <?php if(in_array('xps', $properties)) : ?>checked="checked"<?php endif ?> /><label for="xps"><?=_('XPs')?></label><br />
-		<input type="checkbox" id="roles" name="properties[]" value="roles" <?php if(in_array('roles', $properties)) : ?>checked="checked"<?php endif ?> /><label for="roles"><?=_('Roles')?></label><br />
-		<?php foreach($characterfields as &$characterfield) : ?>
-		<input type="checkbox" id="characterfield-<?=$characterfield['url']?>" name="properties[characterfields][]" value="<?=$characterfield['url']?>" <?php if(array_key_exists('characterfields', $properties) && in_array($characterfield['url'], $properties['characterfields'])) : ?>checked="checked"<?php endif ?> /><label for="characterfield-<?=$characterfield['url']?>"><?=$characterfield['url']?></label><br />
-		<?php endforeach ?>
+	<fieldset class="filter">
+		<ul>
+			<li><input type="checkbox" id="username" name="properties[]" value="username" <?php if(in_array('username', $properties)) : ?>checked="checked"<?php endif ?> /><label for="username"><?=_('Username')?></label></li>
+			<li><input type="checkbox" id="xps" name="properties[]" value="xps" <?php if(in_array('xps', $properties)) : ?>checked="checked"<?php endif ?> /><label for="xps"><?=_('XPs')?></label></li>
+			<li><input type="checkbox" id="roles" name="properties[]" value="roles" <?php if(in_array('roles', $properties)) : ?>checked="checked"<?php endif ?> /><label for="roles"><?=_('Roles')?></label></li>
+			<?php foreach($characterfields as &$characterfield) : ?>
+			<li><input type="checkbox" id="characterfield-<?=$characterfield['url']?>" name="properties[characterfields][]" value="<?=$characterfield['url']?>" <?php if(array_key_exists('characterfields', $properties) && in_array($characterfield['url'], $properties['characterfields'])) : ?>checked="checked"<?php endif ?> /><label for="characterfield-<?=$characterfield['url']?>"><?=$characterfield['url']?></label></li>
+			<?php endforeach ?>
+		</ul>
 		<input type="submit" name="set-properties" value="<?=_('Set properties')?>" />
 	</fieldset>
 	<fieldset>
-		<legend><?=_('Selection')?>:</legend>
+		<legend class="fwb"><small><?=_('Selection')?>:</small></legend>
 		<ul class="gchars cf">
 			<?php foreach($characters as &$character) : ?>
 			<li>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index 716af80b..41e907dc 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -155,13 +155,20 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .notify .fa-times{float:right;padding:0;margin:-12px -10px 0 0;color:#d4d2ce}
 
 
-/** Login & Registration **/
+/** Login, Registration & Filter **/
 
-.logreg{width:auto;display:inline-block;padding:15px 20px;background:#eae8e4;border-radius:3px}
+.logreg{margin:15px 0;width:auto;display:inline-block;padding:15px 20px;background:#eae8e4;border-radius:3px}
 .logreg label{display:block;font-size:.875em}
 .logreg input{margin:5px 0 15px}
 .logreg .cta{display:block}
 
+.filter{margin:10px 0 20px;display:block;width:auto;padding:15px 20px;background:#eae8e4;border-radius:3px}
+.filter ul{margin:0}
+.filter li{display:inline-block;margin-bottom:8px}
+.filter label,input{display:inline;vertical-align:middle}
+.filter input[type=checkbox]{margin:0 8px 0 0}
+.filter label{margin-right:20px;font-size:.875em}
+
 .avatar li{display:inline-block;margin-right:5px;text-align:center}
 .avatar img{border-radius:3px}
 
@@ -210,9 +217,9 @@ input[type="submit"][disabled]{text-shadow:1px 2px #d48c4e;background:#f9ac69;bo
 .gdata{margin:20px 0 40px 0}
 .gdata li{float:left;background:#fff;padding:5px 15px;margin:0 5px 5px 0;border-radius:3px}
 
-.gchars li{background:#fff;padding:15px 0;border-radius:3px;display:inline-block;margin-bottom:5px;width:49%;text-align:center;vertical-align:top}
+.gchars li{background:#fff;padding:15px 5px;border-radius:3px;display:inline-block;margin-bottom:4px;width:49%;text-align:center;vertical-align:top;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
 .gchars img{width:50px;height:50px;border-radius:25px}
-.gchars p{margin:0;padding:0}
+.gchars p{margin:0;padding:0;overflow:hidden;text-overflow:ellipsis}
 .gchars .fa{position:absolute;margin:-10px 0 0}
 
 .gquests li{padding:12px 15px 0 15px;border-radius:3px}