diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala
index 0a2b62a..ca513d4 100644
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -119,6 +119,12 @@
     } getOrElse NotFound
   }
 
+  get("/:userName.atom") {
+    val userName = params("userName")
+    contentType = "application/atom+xml; type=feed"
+    helper.xml.feed(getActivitiesByUser(userName, true))
+  }
+
   get("/:userName/_avatar"){
     val userName = params("userName")
     getAccountByUserName(userName).flatMap(_.image).map { image =>
diff --git a/src/main/twirl/account/activity.scala.html b/src/main/twirl/account/activity.scala.html
index 1f2cefc..ca4c3c7 100644
--- a/src/main/twirl/account/activity.scala.html
+++ b/src/main/twirl/account/activity.scala.html
@@ -2,5 +2,8 @@
 @import context._
 @import view.helpers._
 @main(account, groupNames, "activity"){
+  <div class="pull-right">
+    <a href="@path/@{account.userName}.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
+  </div>
   @helper.html.activities(activities)
 }
diff --git a/src/main/twirl/account/main.scala.html b/src/main/twirl/account/main.scala.html
index 17e05c0..6a16f51 100644
--- a/src/main/twirl/account/main.scala.html
+++ b/src/main/twirl/account/main.scala.html
@@ -28,7 +28,7 @@
 
       </div>
       <div class="span8">
-        <ul class="nav nav-tabs">
+        <ul class="nav nav-tabs" style="margin-bottom: 5px;">
           <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
           @if(account.isGroupAccount){
             <li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li>