diff --git a/idream/css/idream.css b/idream/css/idream.css
index 19f5b3a..1c9acc1 100644
--- a/idream/css/idream.css
+++ b/idream/css/idream.css
@@ -741,7 +741,7 @@ div.copyr {
 	width: 162px;
 }
 .em00, .em01, .em02, .em03, .em04, .em05, .em06, .em07, .em08, .em09, .em10, .em11, .em12, .em13, .em14 {
-	background-image: url("/images/emotions-black.png");
+	background-image: url("../images/emotions/emotions-black.png");
 }
 .error-msg {
 	color: #3366CC;
diff --git a/idream/footer.ftl b/idream/footer.ftl
index 5250af4..4625b60 100644
--- a/idream/footer.ftl
+++ b/idream/footer.ftl
@@ -45,7 +45,8 @@
     };
     $(document).ready(function () {
     	//Util.goTop();Util.goBottom();
-    	Util.init();Util.replaceSideEm($(".side-navi .navi-comments li div.left"));
+    	Util.init();Util.replaceSideEm($("#newcomment li"));
+
     });
     
     // set selected navi
diff --git a/idream/images/emotions/em00.png b/idream/images/emotions/em00.png
new file mode 100644
index 0000000..2420609
Binary files /dev/null and b/idream/images/emotions/em00.png differ
diff --git a/idream/images/emotions/em01.png b/idream/images/emotions/em01.png
new file mode 100644
index 0000000..bddbe24
Binary files /dev/null and b/idream/images/emotions/em01.png differ
diff --git a/idream/images/emotions/em02.png b/idream/images/emotions/em02.png
new file mode 100644
index 0000000..39051f3
Binary files /dev/null and b/idream/images/emotions/em02.png differ
diff --git a/idream/images/emotions/em03.png b/idream/images/emotions/em03.png
new file mode 100644
index 0000000..8cf9113
Binary files /dev/null and b/idream/images/emotions/em03.png differ
diff --git a/idream/images/emotions/em04.png b/idream/images/emotions/em04.png
new file mode 100644
index 0000000..fb061a8
Binary files /dev/null and b/idream/images/emotions/em04.png differ
diff --git a/idream/images/emotions/em05.png b/idream/images/emotions/em05.png
new file mode 100644
index 0000000..83d82b4
Binary files /dev/null and b/idream/images/emotions/em05.png differ
diff --git a/idream/images/emotions/em06.png b/idream/images/emotions/em06.png
new file mode 100644
index 0000000..20d66f0
Binary files /dev/null and b/idream/images/emotions/em06.png differ
diff --git a/idream/images/emotions/em07.png b/idream/images/emotions/em07.png
new file mode 100644
index 0000000..dcda19c
Binary files /dev/null and b/idream/images/emotions/em07.png differ
diff --git a/idream/images/emotions/em08.png b/idream/images/emotions/em08.png
new file mode 100644
index 0000000..676df26
Binary files /dev/null and b/idream/images/emotions/em08.png differ
diff --git a/idream/images/emotions/em09.png b/idream/images/emotions/em09.png
new file mode 100644
index 0000000..94f4605
Binary files /dev/null and b/idream/images/emotions/em09.png differ
diff --git a/idream/images/emotions/em10.png b/idream/images/emotions/em10.png
new file mode 100644
index 0000000..11f9f4c
Binary files /dev/null and b/idream/images/emotions/em10.png differ
diff --git a/idream/images/emotions/em11.png b/idream/images/emotions/em11.png
new file mode 100644
index 0000000..9979744
Binary files /dev/null and b/idream/images/emotions/em11.png differ
diff --git a/idream/images/emotions/em12.png b/idream/images/emotions/em12.png
new file mode 100644
index 0000000..0c9d57f
Binary files /dev/null and b/idream/images/emotions/em12.png differ
diff --git a/idream/images/emotions/em13.png b/idream/images/emotions/em13.png
new file mode 100644
index 0000000..5279d49
Binary files /dev/null and b/idream/images/emotions/em13.png differ
diff --git a/idream/images/emotions/em14.png b/idream/images/emotions/em14.png
new file mode 100644
index 0000000..7594861
Binary files /dev/null and b/idream/images/emotions/em14.png differ
diff --git a/idream/images/emotions/emotions-black.png b/idream/images/emotions/emotions-black.png
new file mode 100644
index 0000000..3e67ef9
Binary files /dev/null and b/idream/images/emotions/emotions-black.png differ
diff --git a/idream/macro-comments.ftl b/idream/macro-comments.ftl
index accbc9d..88424e5 100644
--- a/idream/macro-comments.ftl
+++ b/idream/macro-comments.ftl
@@ -25,7 +25,7 @@
                 </div>
                 <div class="right">
                 	<#if article.commentable>
-                    <a class="no-underline" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
+                    <a rel="nofollow" class="no-underline" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
                     </#if>
                 </div>
                 <div class="clear"></div>
@@ -114,7 +114,7 @@
 <#macro comment_script oId>
 <script type="text/javascript" src="/js/page${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
 <script type="text/javascript">
-    var page = new Page({
+   var page = new Page({
         "nameTooLongLabel": "${nameTooLongLabel}",
         "mailCannotEmptyLabel": "${mailCannotEmptyLabel}",
         "mailInvalidLabel": "${mailInvalidLabel}",
@@ -129,32 +129,25 @@
         "externalRelevantArticles1Label": "${externalRelevantArticles1Label}"
     });
 
-    var addComment = function (result, state) {
+     var addComment = function (result, state) {
         var commentHTML = '<div id="' + result.oId
             + '" class="comment-body"><div class="comment-panel"><div class="left comment-author">'
             + '<div><img alt="' + $("#commentName" + state).val() + '" src="' +
             result.commentThumbnailURL + '"/></div>' + result.replyNameHTML;
 
-        <#--if ($("#commentURL" + state).val().replace(/\s/g, "") === "") {
-            commentHTML += '<a>' + $("#commentName" + state).val() + '</a>';
-        } else {
-            commentHTML += '<a href="http://' + $("#commentURL" + state).val() + '" target="_blank">' + 
-                $("#commentName" + state).val() + '</a>';
-        }-->
         commentHTML += '</div><div class="left comment-info"><div class="left">' + result.commentDate;
         if (state !== "") {
             var commentOriginalCommentName = $("#" + page.currentCommentId).find(".comment-author a").text();
-            commentHTML += '&nbsp;@&nbsp;<a href="' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
-                + 'onmouseover="showComment(this, \'' + page.currentCommentId + '\');"'
+            commentHTML += '&nbsp;@&nbsp;<a href="${servePath}' + result.commentSharpURL.split("#")[0] + '#' + page.currentCommentId + '"'
+                + 'onmouseover="page.showComment(this, \'' + page.currentCommentId + '\', 3);"'
                 + 'onmouseout="page.hideComment(\'' + page.currentCommentId + '\')">' + commentOriginalCommentName + '</a>';
         }
-        commentHTML += '</div><div class="right"> <a class="no-underline" href="javascript:replyTo(\''
+        commentHTML += '</div><div class="right"> <a rel="nofollow" class="no-underline" href="javascript:replyTo(\''
             + result.oId + '\');">${replyLabel}</a>'
             +'</div><div class="clear"></div><div class="comment-content">'
             + Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
             + '</div></div><div class="clear"></div></div></div>';
 
-        <#--page.addCommentAjax(commentHTML, state);-->
         $("#comments").addClass("comments");
         return commentHTML;
     }
@@ -162,20 +155,7 @@
     var replyTo = function (id) {
         var commentFormHTML = "<table class='marginTop12 comment-form' id='replyForm'>";
         page.addReplyForm(id, commentFormHTML);
-    }
-
-    // var showComment = function (it, id) {
-    //     if ( $("#commentRef" + id).length > 0) {
-    //         $("#commentRef" + id).show();
-    //     } else {
-    //         var $refComment = $("#" + id + " .comment-panel").clone();
-    //         $refComment.removeClass().addClass("comment-body-ref").attr("id", "commentRef" + id);
-    //         $("#comments").append($refComment);
-    //     }
-    //     var position =  $(it).position();
-    //     $("#commentRef" + id).css("top", (position.top + 18) + "px");
-    // };
-
+    };
     (function () {
         page.load();
         // emotions