diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
@@ -55,13 +55,13 @@
 
 	//@todo need link to actual comment!
 
-	$on = elgg_echo('on');
+	$commented_on = elgg_echo('generic_comment:on', array($commenter_link, $entity_link));
 
 	$excerpt = elgg_get_excerpt($comment->value, 80);
 
 	$body = <<<HTML
 <span class="elgg-subtext">
-	$commenter_link $on $entity_link ($friendlytime): $excerpt
+	$commented_on ($friendlytime): $excerpt
 </span>
 HTML;
 

diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
@@ -119,4 +119,4 @@
 }
 .elgg-page-footer a:hover {
 	color: #666;
-}
+}
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
@@ -190,4 +190,4 @@
 .elgg-widget-placeholder {
 	border: 2px dashed #dedede;
 	margin-bottom: 15px;
-}
+}
diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
@@ -157,6 +157,6 @@
 	padding: 3px 5px;
 }
 .elgg-output img {
-    max-width: 100%;
-    height: auto;
-}
+	max-width: 100%;
+	height: auto;
+}
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php
@@ -56,7 +56,8 @@
 elgg.version = '<?php echo get_version(); ?>';
 elgg.release = '<?php echo get_version(true); ?>';
 elgg.config.wwwroot = '<?php echo elgg_get_site_url(); ?>';
-elgg.security.interval = 5 * 60 * 1000; <?php //@todo make this configurable ?>
+<?php //@todo make this configurable ?>
+elgg.security.interval = 5 * 60 * 1000;
 elgg.config.domReady = false;
 elgg.config.language = '<?php echo isset($CONFIG->language) ? $CONFIG->language : 'en'; ?>';
 elgg.config.languageReady = false;