diff --git a/rhodecode/apps/repository/views/repo_commits.py b/rhodecode/apps/repository/views/repo_commits.py
--- a/rhodecode/apps/repository/views/repo_commits.py
+++ b/rhodecode/apps/repository/views/repo_commits.py
@@ -473,10 +473,10 @@ class RepoCommitsView(RepoAppView):
                     self.db_repo_name, commit_obj=commit)
 
                 comment_data = data
-                comment_type = 'inline' if is_inline else 'general'
+                posted_comment_type = 'inline' if is_inline else 'general'
                 channelstream.comment_channelstream_push(
                     self.request, comment_broadcast_channel, self._rhodecode_user,
-                    _('posted a new {} comment').format(comment_type),
+                    _('posted a new {} comment').format(posted_comment_type),
                     comment_data=comment_data)
 
         # finalize, commit and redirect
diff --git a/rhodecode/public/css/comments.less b/rhodecode/public/css/comments.less
--- a/rhodecode/public/css/comments.less
+++ b/rhodecode/public/css/comments.less
@@ -520,10 +520,6 @@ form.comment-form {
             color: @grey4;
         }
 
-        p {
-            padding: 0;
-            margin: 0;
-        }
     }
 
     .action-buttons-extra {
diff --git a/rhodecode/templates/changeset/changeset_file_comment.mako b/rhodecode/templates/changeset/changeset_file_comment.mako
--- a/rhodecode/templates/changeset/changeset_file_comment.mako
+++ b/rhodecode/templates/changeset/changeset_file_comment.mako
@@ -325,10 +325,9 @@
         ## inject form here
     </div>
     <script type="text/javascript">
-        var lineNo = 'general';
         var resolvesCommentId = null;
         var generalCommentForm = Rhodecode.comments.createGeneralComment(
-            lineNo, "${placeholder}", resolvesCommentId);
+            'general', "${placeholder}", resolvesCommentId);
 
         // set custom success callback on rangeCommit
         % if is_compare:
@@ -543,13 +542,13 @@
 
         <div class="toolbar-text">
             <% renderer_url = '<a href="%s">%s</a>' % (h.route_url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper()) %>
-            <p>${_('Styling with {} is supported.').format(renderer_url)|n}
+            <span>${_('Styling with {} is supported.').format(renderer_url)|n}
 
             <i class="icon-info-circled tooltip-hovercard"
                data-hovercard-alt="ALT"
                data-hovercard-url="javascript:commentHelp('${c.visual.default_renderer.upper()}')"
                data-comment-json-b64='${h.b64(h.json.dumps({}))}'></i>
-            </p>
+            </span>
         </div>
     </div>
 
diff --git a/rhodecode/templates/changeset/changeset_range.mako b/rhodecode/templates/changeset/changeset_range.mako
--- a/rhodecode/templates/changeset/changeset_range.mako
+++ b/rhodecode/templates/changeset/changeset_range.mako
@@ -104,8 +104,6 @@
       %for commit in c.commit_ranges:
         ## commit range header for each individual diff
         <h3>
-
-
             <a class="tooltip-hovercard revision" data-hovercard-alt="Commit: ${commit.short_id}" data-hovercard-url="${h.route_path('hovercard_repo_commit', repo_name=c.repo_name, commit_id=commit.raw_id)}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id)}">
                 ${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}
             </a>