diff --git a/app/coffee/modules/common.coffee b/app/coffee/modules/common.coffee
index 57bd50d9..9174e7f2 100644
--- a/app/coffee/modules/common.coffee
+++ b/app/coffee/modules/common.coffee
@@ -123,7 +123,7 @@ ChangeDirective = ->
             </a>
         </div>
         <div class="comment-content">
-            <a class="username" href="TODO" title="<%- userFullName %>">
+            <a class="username" href="" title="<%- userFullName %>">
                 <%- userFullName %>
             </a>
             <% if(hasChanges){ %>
@@ -138,12 +138,12 @@ ChangeDirective = ->
             </div>
             <% } %>
 
-            <p class="comment">
+            <div class="comment wysiwyg">
                 <%= comment %>
-            </p>
-            <p class="date">
+            </div>
+            <div class="date">
                 <%- creationDate %>
-            </p>
+            </div>
         </div>
     """)
     changeBaseTemplate = _.template("""
@@ -154,16 +154,16 @@ ChangeDirective = ->
     </div>
     <div class="activity-content">
         <div class="activity-username">
-            <a class="username" href="TODO" title="<%- userFullName %>">
+            <a class="username" href="" title="<%- userFullName %>">
                 <%- userFullName %>
             </a>
             <span class="date">
                 <%- creationDate %>
             </span>
         </div>
-        <p class="comment">
+        <div class="comment wysiwyg">
             <%= comment %>
-        </p>
+        </div>
     </div>
     """)
     standardChangeFromToTemplate = _.template("""
@@ -310,12 +310,12 @@ ChangeDirective = ->
         prettyPrintModification = (value) ->
             if typeIsArray(value)
                 if value.length == 0
-                  #TODO i18n
-                  return "None"
-                else
-                  return value.join(", ")
+                    #TODO i18n
+                    return "None"
+                return value.join(", ")
 
             if value == ""
+                #TODO i18n
                 return "None"
 
             return value
diff --git a/app/partials/views/modules/activity.jade b/app/partials/views/modules/activity.jade
index 63ed2805..8aa1d2c2 100644
--- a/app/partials/views/modules/activity.jade
+++ b/app/partials/views/modules/activity.jade
@@ -1,6 +1,8 @@
 section.us-activity.hidden
+    //- modules/common.coffee - ChangeDirective
     div.activity-single(tg-change, ng-model="change", mode="activity", ng-repeat="change in history")
 
-    //a.more-activity(href="", title="show more comments")
-    //     span show previous activity
-    //     span.prev-activity-num (3 more)
+    //- TODO
+    //- a.more-activity(href="", title="show more comments")
+    //-     span show previous activity
+    //-     span.prev-activity-num (3 more)
diff --git a/app/partials/views/modules/comments.jade b/app/partials/views/modules/comments.jade
index 0928fa02..cecd93af 100644
--- a/app/partials/views/modules/comments.jade
+++ b/app/partials/views/modules/comments.jade
@@ -5,9 +5,10 @@ section.us-comments
         textarea(placeholder="Write here a new commet", ng-model="commentModel.comment", tg-markitup)
         a.button.button-green.save-comment(href="", title="Comment") Comment
     div.comment-list
-        //common.coffee
+        //- modules/common.coffee - ChangeDirective
         div.comment-single(tg-change, mode="comment", ng-model="comment", ng-repeat="comment in comments")
 
-         //a.more-comments(href="", title="show more comments")
-                //span show previous comments
-                //span.prev-comments-num (3 more)
+        //- TODO
+        //- a.more-comments(href="", title="show more comments")
+        //-     span show previous comments
+        //-     span.prev-comments-num (3 more)