diff --git a/boot.php b/boot.php
index d347e6009d..7c114fd431 100644
--- a/boot.php
+++ b/boot.php
@@ -1135,7 +1135,7 @@ function format_like($cnt,$arr,$type,$id) {
 		if($total >= MAX_LIKERS)
 			$str .= t(', and ') . $total - MAX_LIKERS . t(' other people');
 		$str .= (($type === 'like') ? t(' like this.') : t(' don\'t like this.'));
-		$o .= '<div id="' . $type . 'list-' . $id . '" style="display: none;" >' . $str . '</div>';
+		$o .= "\t" . '<div id="' . $type . 'list-' . $id . '" style="display: none;" >' . $str . '</div>';
 	}
 	return $o;
 }}
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index 62b3ce18a7..1b1f3a49e9 100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -1,23 +1,21 @@
+		<div class="comment-$wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" >
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
 
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >Comment</textarea>
 
-<div class="comment-$wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-	<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" >
-		<input type="hidden" name="type" value="$type" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="parent" value="$parent" />
-		<input type="hidden" name="return" value="$return_path" />
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="Submit" />
+				</div>
 
-		<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-			<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				<div class="comment-edit-end"></div>
+			</form>
 		</div>
-		<div class="comment-edit-photo-end"></div>
-		<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >Comment</textarea>
-
-		<div class="comment-edit-text-end"></div>
-		<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-			<input type="submit" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="Submit" />
-		</div>
-
-		<div class="comment-edit-end"></div>
-	</form>
-</div>
diff --git a/view/like.tpl b/view/like.tpl
index 73cbb2d4ae..1c385e5deb 100644
--- a/view/like.tpl
+++ b/view/like.tpl
@@ -1,5 +1,5 @@
 <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-<img src="images/like.gif" alt="I like this" title="I like this [toggle]" onclick="dolike($id,'like');" />
-<img src="images/dislike.gif" alt="I don't like this" title="I don't like this [toggle]" onclick="dolike($id,'dislike');" />
-<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
-</div>
+				<img src="images/like.gif" alt="I like this" title="I like this [toggle]" onclick="dolike($id,'like');" />
+				<img src="images/dislike.gif" alt="I don't like this" title="I don't like this [toggle]" onclick="dolike($id,'dislike');" />
+				<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
+			</div>
diff --git a/view/wall_item_drop.tpl b/view/wall_item_drop.tpl
index 84a2f3a8ef..66777db15c 100644
--- a/view/wall_item_drop.tpl
+++ b/view/wall_item_drop.tpl
@@ -1,2 +1,2 @@
 <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" ><a href="item/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="Delete" title="Delete" id="wall-item-delete-icon-$id" class="wall-item-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>
-<div class="wall-item-delete-end"></div>
+		<div class="wall-item-delete-end"></div>