3 files changed, 17 insertions, 2 deletions
diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php
index 157b00c6e..659acd869 100644
--- a/views/default/css/elements/chrome.php
+++ b/views/default/css/elements/chrome.php
@@ -87,6 +87,13 @@ h2 {
 	background-color: white;
 }
 
+.elgg-comments {
+	margin-top: 25px;
+}
+.elgg-comments > form {
+	margin-top: 15px;
+}
+
 <?php //@todo remove ?>
 .radius8 {
 	-webkit-border-radius: 8px;
@@ -96,6 +103,9 @@ h2 {
 /* ***************************************
 	USER INPUT DISPLAY RESET
 *************************************** */
+.elgg-output {
+	margin-top: 10px;
+}
 .elgg-output ul, ol {
 	margin: 0 1.5em 1.5em 0;
 	padding-left: 1.5em;
diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php
index 8a2b89f2d..f0d42fb80 100644
--- a/views/default/forms/comments/add.php
+++ b/views/default/forms/comments/add.php
@@ -10,7 +10,7 @@
 if (isset($vars['entity']) && elgg_is_logged_in()) {
 ?>
 <div class="mbn">
-	<label><?php echo elgg_echo("generic_comments:text"); ?></label>
+	<label><?php echo elgg_echo("generic_comments:add"); ?></label>
 	<?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?>
 </div>
 <?php
diff --git a/views/default/page/elements/comments.php b/views/default/page/elements/comments.php
index 6a7e74b2a..3d44f5785 100644
--- a/views/default/page/elements/comments.php
+++ b/views/default/page/elements/comments.php
@@ -23,7 +23,12 @@ $options = array(
 	'guid' => $vars['entity']->getGUID(),
 	'annotation_name' => 'generic_comment'
 );
-echo elgg_list_annotations($options);
+$html = elgg_list_annotations($options);
+if ($html) {
+	echo '<h3>Comments</h3>';
+	echo $html;
+}
+//echo strlen($html);
 
 if ($show_add_form) {
 	$form_vars = array('name' => 'elgg_add_comment');