diff --git a/view/global.css b/view/global.css
index 477f778d9a..e1ccd8b920 100644
--- a/view/global.css
+++ b/view/global.css
@@ -252,6 +252,7 @@ a {
   background: none;
   height: 80px;
   width: 80px;
+  cursor: pointer;
 }
 
 .selected-identity img {
diff --git a/view/templates/manage.tpl b/view/templates/manage.tpl
index 8a7922d7be..b1ccff5195 100644
--- a/view/templates/manage.tpl
+++ b/view/templates/manage.tpl
@@ -3,13 +3,13 @@
 <div id="identity-manage-desc">{{$desc}}</div>
 <div id="identity-manage-choose">{{$choose}}</div>
 
-<div id="identity-selector-wrapper">
+<div id="identity-selector-wrapper" role="menu">
 	<form action="manage" method="post" >
 
 	{{foreach $identities as $id}}
 		<div class="itentity-match-wrapper {{if $id.selected}}selected-identity{{/if}}" id="identity-match-{{$id.uid}}">
 			<div class="identity-match-photo" id="identity-match-photo-{{$id.uid}}">
-				<button name="identity" value="{{$id.uid}}" onclick="this.form.submit();" title="{{$id.username}}">
+				<button role="menuitem" name="identity" value="{{$id.uid}}" onclick="this.form.submit();" title="{{$id.username}}">
 					<img src="{{$id.thumb}}" alt="{{$id.username}}" />
 				</button>
 			</div>
@@ -25,7 +25,7 @@
 		</div>
 	{{/foreach}}
 
+	<div class="identity-match-break"></div>
+
 	</form>
 </div>
-	
-	
\ No newline at end of file