diff --git a/samples/appengine/app.yaml b/samples/appengine/app.yaml
index 66a711a..f3d0635 100644
--- a/samples/appengine/app.yaml
+++ b/samples/appengine/app.yaml
@@ -4,5 +4,9 @@
 api_version: 1
 
 handlers:
+- url: /static
+  static_dir: static
+
 - url: .*
   script: main.py
+
diff --git a/samples/appengine/main.py b/samples/appengine/main.py
index 6832dda..14c6593 100755
--- a/samples/appengine/main.py
+++ b/samples/appengine/main.py
@@ -19,6 +19,7 @@
 
 
 import httplib2
+import logging
 import os
 
 from apiclient.discovery import build
@@ -33,7 +34,7 @@
 from google.appengine.ext.webapp import util
 from google.appengine.ext.webapp.util import login_required
 
-STEP2_URI = 'http://m-buzz.appspot.com/auth_return'
+STEP2_URI = 'http://%s.appspot.com/auth_return' % os.environ['APPLICATION_ID']
 
 
 class Flow(db.Model):
@@ -57,9 +58,15 @@
       http = c.credentials.authorize(http)
       p = build("buzz", "v1", http=http)
       activities = p.activities()
-      activitylist = activities.list(scope='@self', userId='@me')
+      activitylist = activities.list(scope='@consumption', userId='@me')
+      logging.info(activitylist)
       path = os.path.join(os.path.dirname(__file__), 'welcome.html')
-      self.response.out.write(template.render(path, activitylist))
+      logout = users.create_logout_url('/')
+      self.response.out.write(
+          template.render(
+              path, {'activitylist': activitylist,
+                     'logout': logout
+                     }))
     else:
       flow = FlowThreeLegged(buzz_discovery,
                      consumer_key='anonymous',
diff --git a/samples/appengine/static/go.png b/samples/appengine/static/go.png
new file mode 100644
index 0000000..e5aacda
--- /dev/null
+++ b/samples/appengine/static/go.png
Binary files differ
diff --git a/samples/appengine/welcome.html b/samples/appengine/welcome.html
index 421711b..da40a16 100644
--- a/samples/appengine/welcome.html
+++ b/samples/appengine/welcome.html
@@ -1,13 +1,29 @@
 <html>
   <head>
     <title>Buzz Stuff</title>
+    <style type=text/css>
+      td  { vertical-align: top; padding: 0.5em }
+      img { border:0 }
+    </style>
   </head>
   <body>
-
-    <ul>
-      {% for item in items %}
-      <li>{{ item.object.content }}</li>
+    <p><a href="{{ logout }}">Logout</a></p>
+      <table border=0>
+      {% for item in activitylist.items %}
+      <tr valign=top>
+        <td>
+          <a href="{{ item.actor.profileUrl }}"><img
+            src="{{ item.actor.thumbnailUrl }}"></a><br>
+          <a href="{{ item.actor.profileUrl }}">{{ item.actor.name }}</a></td>
+      <td>
+        {{ item.object.content }}
+        </td>
+        <td>
+          <a href="{{ item.object.links.alternate.0.href }}"><img
+            src="/static/go.png"></a>
+        </td>
+      </tr>
       {% endfor %}
-    </ul>
+      </table>
   </body>
 </html>