diff --git a/file/js/TimWolla.WCF.Chat.js b/file/js/TimWolla.WCF.Chat.js
index 04c75db..6881004 100644
--- a/file/js/TimWolla.WCF.Chat.js
+++ b/file/js/TimWolla.WCF.Chat.js
@@ -27,7 +27,7 @@ if (typeof TimWolla.WCF == 'undefined') TimWolla.WCF = {};
 		 */
 		bindEvents: function () {
 			$('.smiley').click($.proxy(function (event) {
-				this.insertText($(event.target).attr('alt'));
+				this.insertText(' '+$(event.target).attr('alt')+' ');
 			}, this));
 
 			// recalculate the width of chatRoomContent on resize
@@ -58,8 +58,10 @@ if (typeof TimWolla.WCF == 'undefined') TimWolla.WCF = {};
 				this.submit($(event.target));
 			}, this));
 			
-			$('button').click(function (event) {
-				window.location.href = $(event.target).attr('value');
+			$('#chatClear').click(function () {
+				event.preventDefault();
+				$('.chatMessage').remove();
+				$('#chatInput').focus();
 			});
 		},
 		/**
diff --git a/template/chat.tpl b/template/chat.tpl
index 9b36180..f65b429 100644
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -201,22 +201,22 @@
 			<div class="smallButtons">
 				<ul>
 					<li>
-						<a id="chatAutoscrollButton" href="javascript:;">
+						<a class="chatToggle" data-status="1" href="javascript:;">
 							<img alt="" src="{icon}enabled1{/icon}" /> <span>Scroll</span>
 						</a>
 					</li>
 					<li>
-						<a href="javascript:;">
+						<a class="chatToggle" data-status="0" href="javascript:;">
 							<img alt="" src="{icon}disabled1{/icon}" /> <span>Notify</span>
 						</a>
 					</li>
 					<li>
-						<a href="javascript:;">
+						<a id="chatClear" href="javascript:;">
 							<img alt="" src="{icon}delete1{/icon}" /> <span>Clear</span>
 						</a>
 					</li>
 					<li>
-						<a href="javascript:;">
+						<a id="chatMark" href="javascript:;">
 							<img alt="" src="{icon}check1{/icon}" /> <span>Mark</span>
 						</a>
 					</li>