diff --git a/src/app/components/noosfero-activities/activity/activity.directive.js b/src/app/components/noosfero-activities/activity/activity.directive.js
index 7905ec3..1e73ab9 100644
--- a/src/app/components/noosfero-activities/activity/activity.directive.js
+++ b/src/app/components/noosfero-activities/activity/activity.directive.js
@@ -13,9 +13,20 @@
           activity: '=',
       },
       templateUrl: 'app/components/noosfero-activities/activity/activity.html',
-      replace: true
+      replace: true,
+      controller: ActivityController,
+      controllerAs: 'vm',
+      bindToController: true
     };
     return directive;
+
+    /** @ngInject */
+    function ActivityController() {
+      var vm = this;
+      vm.getActivityTemplate = function(activity) {
+        return 'app/components/noosfero-activities/activity/' + activity.verb + '.html';
+      }
+    }
   }
 
 })();
diff --git a/src/app/components/noosfero-activities/activity/activity.html b/src/app/components/noosfero-activities/activity/activity.html
index 8662e91..63eb36b 100644
--- a/src/app/components/noosfero-activities/activity/activity.html
+++ b/src/app/components/noosfero-activities/activity/activity.html
@@ -1,12 +1,3 @@
 <div class="activity">
-  <div class="timeline-badge info"><i class="fa fa-check-square-o"></i></div>
-  <div class="timeline-panel">
-    <div class="timeline-heading">
-      <h4 class="timeline-title">{{activity.verb}}</h4>
-      <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="activity.created_at"></span></small></p>
-    </div>
-    <div class="timeline-body">
-      <pre>{{activity}}</pre>
-    </div>
-  </div>
+  <ng-include src="vm.getActivityTemplate(vm.activity)"></ng-include>
 </div>
diff --git a/src/app/components/noosfero-activities/activity/add_member_in_community.html b/src/app/components/noosfero-activities/activity/add_member_in_community.html
new file mode 100644
index 0000000..e1faf27
--- /dev/null
+++ b/src/app/components/noosfero-activities/activity/add_member_in_community.html
@@ -0,0 +1,8 @@
+<div class="timeline-badge info"><i class="fa fa-user-plus"></i></div>
+<div class="timeline-panel">
+  <div class="timeline-heading">
+    <h4 class="timeline-title"><strong ng-bind="vm.activity.user.name"></strong> has joined the community</h4>
+    <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="vm.activity.created_at"></span></small></p>
+  </div>
+  <div class="timeline-body"></div>
+</div>
diff --git a/src/app/components/noosfero-activities/activity/create_article.html b/src/app/components/noosfero-activities/activity/create_article.html
new file mode 100644
index 0000000..4857ded
--- /dev/null
+++ b/src/app/components/noosfero-activities/activity/create_article.html
@@ -0,0 +1,19 @@
+<div class="timeline-badge success"><i class="fa fa-file-text"></i></div>
+<div class="timeline-panel">
+  <div class="timeline-heading">
+    <h4 class="timeline-title">
+      <strong ng-bind="vm.activity.user.name"></strong> has published on community <strong ng-bind="vm.activity.target.article.profile.name"></strong>
+    </h4>
+    <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="vm.activity.created_at"></span></small></p>
+  </div>
+  <div class="timeline-body">
+    <div class="article">
+      <div class="title">
+        <a ng-href="/{{vm.activity.target.article.profile.identifier}}/{{vm.activity.target.article.path}}">{{vm.activity.target.article.title}}</a>
+      </div>
+      <div class="lead small">
+        <div ng-bind-html="vm.activity.target.article.body | limitTo: 50"></div>
+      </div>
+    </div>
+  </div>
+</div>
--
libgit2 0.21.2