diff --git a/client/css/style.css b/client/css/style.css
index 6108e4b..c23d646 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -116,6 +116,7 @@ button::-moz-focus-inner {
 	transition: all .25s;
 	width: 100%;
 }
+#menu .opt.active,
 #menu .opt:hover {
 	background: #e1e4e7;
 	color: #34495e;
@@ -164,7 +165,7 @@ button::-moz-focus-inner {
 	padding: 0 6px;
 }
 #networks .badge.highlight {
-	background: #f8f5f5;
+	background: #f8e2e2;
 	color: #e74c3c;
 }
 #networks .badge:empty {
diff --git a/client/js/chat.js b/client/js/chat.js
index 0a4d6f1..4f80ad1 100644
--- a/client/js/chat.js
+++ b/client/js/chat.js
@@ -140,7 +140,7 @@ $(function() {
 	
 	chat.on("append", ".messages", function() {
 		var messages = $(this);
-		var id = messages.closest(".window").find(".input").parent().data("target");
+		var id = messages.closest(".window").find(".form").data("target");
 		var badge = $("#channel-" + id + ":not(.active) .badge");
 		if (badge.length != 0) {
 			var i = (parseInt(badge.html()) || 0) + 1;
@@ -159,7 +159,7 @@ $(function() {
 	
 	chat.on("click", ".user", function() {
 		var user = $(this);
-		var id = user.closest(".window").find(".input").parent().data("target");
+		var id = user.closest(".window").find(".form").data("target");
 		var name = user.html().replace(/[\s+@]/g, "");
 		if (name.match(/[#.]|-!-/) != null) {
 			return;