diff --git a/include/conversation.php b/include/conversation.php
index ca31fd8a0..5a84ca42a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -892,7 +892,7 @@ function item_photo_menu($item){
 	foreach($menu as $k=>$v){
 		if(strpos($v,'javascript:') === 0) {
 			$v = substr($v,11);
-			$o .= "<li role=\"menuitem\"><a href=\"#\" onclick=\"$v\">$k</a></li>\n";
+			$o .= "<li role=\"menuitem\"><a onclick=\"$v\">$k</a></li>\n";
 		}
 		elseif ($v!="") $o .= "<li role=\"menuitem\"><a href=\"$v\">$k</a></li>\n";
 	}
diff --git a/include/group.php b/include/group.php
index bbfac7ac1..b7e1963bf 100644
--- a/include/group.php
+++ b/include/group.php
@@ -263,8 +263,8 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 			);
 		}
 	}
-	
-	
+
+
 	$tpl = get_markup_template("group_side.tpl");
 	$o = replace_macros($tpl, array(
 		'$title'		=> t('Groups'),
@@ -276,8 +276,8 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 		'$groups'		=> $groups,
 		'$add'			=> t('add'),
 	));
-		
-	
+
+
 	return $o;
 }
 
diff --git a/include/text.php b/include/text.php
index 829e37c2c..510db01bf 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1676,11 +1676,14 @@ function get_plink($item) {
 				//'href' => $a->get_baseurl()."/display/".$a->user['nickname']."/".$item['id'],
 				'href' => $a->get_baseurl()."/display/".$item['guid'],
 				'orig' => $a->get_baseurl()."/display/".$item['guid'],
-				'title' => t('link to source'),
+				'title' => t('local thread'),
+				'orig_title' => t('local thread'),
 			);
 
-		if (x($item,'plink'))
+		if (x($item,'plink')) {
 			$ret["href"] = $item['plink'];
+			$ret["title"] = t('link to source');
+		}
 
 	} elseif (x($item,'plink') && ($item['private'] != 1))
 		$ret = array(
diff --git a/view/global.css b/view/global.css
index 0033418b8..94896ea23 100644
--- a/view/global.css
+++ b/view/global.css
@@ -180,15 +180,30 @@ span.oembed, h4 {
 
 
 /* plain text editor upload/select popup */
-
-.fbrowser .path a { padding: 5px; }
+
+.fbrowser .path a { padding: 5px; }
 .fbrowser .path a:before { content: "/"; padding-right: 5px;}
 .fbrowser .folders ul { list-style-type: none; padding-left: 10px;}
-.fbrowser .list { height: auto; overflow-y: hidden; margin: 10px 0px; }
-.fbrowser.image .photo-album-image-wrapper { float: left; }
+.fbrowser .list { height: auto; overflow-y: hidden; margin: 10px 0px; }
+.fbrowser.image .photo-album-image-wrapper { float: left; }
 .fbrowser.image a img { height: 48px; }
-.fbrowser.image a p { display: none;}
-.fbrowser.file .photo-album-image-wrapper { float:none;  white-space: nowrap; }
-.fbrowser.file img { display: inline; }
+.fbrowser.image a p { display: none;}
+.fbrowser.file .photo-album-image-wrapper { float:none;  white-space: nowrap; }
+.fbrowser.file img { display: inline; }
 .fbrowser.file p  { display: inline; white-space: nowrap; }
-.fbrowser .upload { clear: both; padding-top: 1em;}
+.fbrowser .upload { clear: both; padding-top: 1em;}
+
+a {
+  cursor: pointer;
+}
+
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  border: 0;
+}
diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl
index c1220bc1e..bf9470b64 100644
--- a/view/templates/acl_selector.tpl
+++ b/view/templates/acl_selector.tpl
@@ -1,7 +1,7 @@
 
 <div id="acl-wrapper">
 	<input id="acl-search">
-	<a href="#" id="acl-showall">{{$showall}}</a>
+	<a id="acl-showall">{{$showall}}</a>
 	<div id="acl-list">
 		<div id="acl-list-content">
 		</div>
@@ -11,8 +11,8 @@
 
 <div class="acl-list-item" rel="acl-template" style="display:none">
 	<img data-src="{0}"><p>{1}</p>
-	<a href="#" class='acl-button-show'>{{$show}}</a>
-	<a href="#" class='acl-button-hide'>{{$hide}}</a>
+	<a class='acl-button-show'>{{$show}}</a>
+	<a class='acl-button-hide'>{{$hide}}</a>
 </div>
 
 {{if $networks}}
diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl
index 2acb00ae9..c7e1aa895 100644
--- a/view/templates/group_side.tpl
+++ b/view/templates/group_side.tpl
@@ -13,7 +13,7 @@
 					/>
 				{{/if}}			
 				{{if $group.edit}}
-					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a>
+					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"><span class="sr-only">{{$edittext}}</span></span></a>
 				{{/if}}
 				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
 			</li>
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index f2830aae9..26b0aa362 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -2938,14 +2938,3 @@ a.mail-list-link {
 
 /* upload/select popup */
 .fbrowser.image .photo-album-image-wrapper { margin-left: 10px; }
-
-.sr-only {
-    position: absolute;
-    width: 1px;
-    height: 1px;
-    padding: 0;
-    margin: -1px;
-    overflow: hidden;
-    clip: rect(0,0,0,0);
-    border: 0;
-}
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index f4632cab3..41c978942 100644
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -44,7 +44,7 @@
 				<a aria-hidden="true" href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
 					<img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
 				</a>
-				<a rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<a rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}"></a>
 				<ul role="menu" aria-haspopup="true" class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
 				{{$item.item_photo_menu}}
 				</ul>
@@ -95,14 +95,14 @@
 	</div>	
 	<div class="wall-item-bottom">
 		<div class="wall-item-links">
-			{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.orig}}"><i class="icon-link icon-large"><span class="sr-only">{{$item.plink.title}}</span></i></a>{{/if}}
+			{{if $item.plink}}<a role="button" title="{{$item.plink.orig_title}}" href="{{$item.plink.orig}}"><i class="icon-link icon-large"><span class="sr-only">{{$item.plink.orig_title}}</span></i></a>{{/if}}
 		</div>
 		<div class="wall-item-actions">
 			<div class="wall-item-actions-social">
 			{{if $item.threaded}}
 			{{/if}}
 			{{if $item.comment}}
-				<span id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" title="{{$item.switchcomment}}"><i class="icon-reply"><span class="sr-only">{{$item.switchcomment}}</span></i></span>
+				<a role="button" id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" title="{{$item.switchcomment}}"><i class="icon-reply"><span class="sr-only">{{$item.switchcomment}}</span></i></a>
 			{{/if}}
 			{{if $item.vote}}
 				{{if $item.vote.like}}