diff --git a/templates/Sparkle/admin/domains/domains_domain.tpl b/templates/Sparkle/admin/domains/domains_domain.tpl
index 7befbf89..732908ca 100644
--- a/templates/Sparkle/admin/domains/domains_domain.tpl
+++ b/templates/Sparkle/admin/domains/domains_domain.tpl
@@ -1,4 +1,4 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
+<tr>
 	<td>{$row['domain']}
 		<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
 			&nbsp;({$lng['admin']['stdsubdomain']})
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css
index 1982fdf8..10ab93aa 100644
--- a/templates/Sparkle/assets/css/main.css
+++ b/templates/Sparkle/assets/css/main.css
@@ -542,6 +542,10 @@ table {
 	box-shadow:0 0 0 #000!important;
 }
 
+table.bradius tbody tr:hover {
+	background-color: #f5f5f5;
+}
+
 table tr.top td {
 	vertical-align: top;
 }
diff --git a/templates/Sparkle/assets/js/main.js b/templates/Sparkle/assets/js/main.js
index 286cc5ef..b9147e6c 100644
--- a/templates/Sparkle/assets/js/main.js
+++ b/templates/Sparkle/assets/js/main.js
@@ -20,6 +20,7 @@ $(document).ready(function() {
 		return false;
 	});
 	
+	// Back buttons
 	$('#historyback, .historyback').click(function() {
 		parent.history.back();
 		return false;
@@ -83,14 +84,6 @@ $(document).ready(function() {
 	
 	// set focus on username-field if on loginpage
 	$("#loginname").focus();
-	
-	if ($("table.bradius").length !== 0) {
-		$("table.bradius tbody tr").hover(function() {
-			$(this).css("background-color", "#f5f5f5");
-		}, function() {
-			$(this).css("background-color", "#fff");
-		});
-	}
 
 	// Auto-select next field in configfile - wizard
 	$('#config_distribution').change(function (){
@@ -103,11 +96,7 @@ $(document).ready(function() {
 		window.location.href=window.location.href + '&daemon=' + this.options[ this.selectedIndex ].value;
 	});
 
-	// Back-button
-	$('#yesnobutton').click(function() {
-		history.back();
-	});
-
+	// Speciallogfile popup dialog
     $('input[name=speciallogfile]').click(function () {
             if($.getQueryVariable("page") == "domains" && $.getQueryVariable("action") == "edit") {
                     $speciallogdialog.dialog("open");
diff --git a/templates/Sparkle/customer/domains/domains_domain.tpl b/templates/Sparkle/customer/domains/domains_domain.tpl
index 09a495fa..681e1487 100644
--- a/templates/Sparkle/customer/domains/domains_domain.tpl
+++ b/templates/Sparkle/customer/domains/domains_domain.tpl
@@ -1,4 +1,4 @@
-<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
+<tr>
 	<td><a href="http://{$row['domain']}" target="_blank">{$row['domain']}</a></td>
 	<td>
 		<if $row['aliasdomain'] == ''>{$row['documentroot']}</if>
diff --git a/templates/Sparkle/misc/question_yesno.tpl b/templates/Sparkle/misc/question_yesno.tpl
index ca34e391..d42be867 100644
--- a/templates/Sparkle/misc/question_yesno.tpl
+++ b/templates/Sparkle/misc/question_yesno.tpl
@@ -10,7 +10,7 @@ $header
 					<input type="hidden" name="send" value="send" />
 					{$hiddenparams}
 					<input type="submit" name="submitbutton" value="{$lng['panel']['yes']}" />&nbsp;
-					<input type="button" class="nobutton" value="{$lng['panel']['no']}" id="yesnobutton" />
+					<input type="button" class="nobutton" value="{$lng['panel']['no']}" id="historyback" />
 				</div>
 			</div>
 		</div>
diff --git a/templates/Sparkle/misc/question_yesno_checkbox.tpl b/templates/Sparkle/misc/question_yesno_checkbox.tpl
index e024e4c7..c8d93dda 100644
--- a/templates/Sparkle/misc/question_yesno_checkbox.tpl
+++ b/templates/Sparkle/misc/question_yesno_checkbox.tpl
@@ -11,7 +11,7 @@ $header
 					<input type="hidden" name="send" value="send" />
 					{$hiddenparams}
 					<input type="submit" name="submitbutton" value="{$lng['panel']['yes']}" />&nbsp;
-					<input type="button" class="nobutton" value="{$lng['panel']['no']}" id="yesnobutton" />
+					<input type="button" class="nobutton" value="{$lng['panel']['no']}" id="historyback" />
 				</div>
 			</div>
 		</div>