diff --git a/actions/showstream.php b/actions/showstream.php
index 30930de25a..b4844aabd4 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -92,8 +92,6 @@ class ShowstreamAction extends StreamAction {
 	function show_profile($profile) {
 		common_element_start('div', 'profile');
 
-		common_element('h2', 'nickname', $profile->nickname);
-
 		$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
 		if ($avatar) {
 			common_element('img', array('src' => $avatar->url,
@@ -108,11 +106,11 @@ class ShowstreamAction extends StreamAction {
 										  'class' => 'fullname'),
 							   $profile->fullname);
 			} else {
-				common_element('span', 'fullname', $profile->fullname);
+				common_element('div', 'fullname', $profile->fullname);
 			}
 		}
 		if ($profile->location) {
-			common_element('span', 'location', $profile->location);
+			common_element('div', 'location', $profile->location);
 		}
 		if ($profile->bio) {
 			common_element('div', 'bio', $profile->bio);
diff --git a/doc/TODO b/doc/TODO
index 8691b50729..50b361bed1 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -129,3 +129,4 @@
 - form token in login to prevent XSS
 - release 1.0
 - Atom Publishing Protocol
+- "Universal" public feed
\ No newline at end of file