diff --git a/resources/css/app.css b/resources/css/app.css
index d2f6419..3c6beeb 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -69,7 +69,7 @@ body > div.ui-layout-north {
 	right: 0;*/
 }
 
-	form#wrapperSearchWidget {
+	body > .ui-layout-north > form {
 		display: inline-block;
 		float: right;
 		clear: right;
@@ -78,18 +78,18 @@ body > div.ui-layout-north {
 		z-index: 100;
 	}
 
-	form#wrapperSearchWidget button {
+	body > .ui-layout-north > form button {
 		height: 20px;
 		width: 25px;
 		line-height: 0px;
 		padding: 0;
 	}
 
-	form#wrapperSearchWidget button [class*=" icon-"] {
+	body > .ui-layout-north > form button [class*=" icon-"] {
 		margin-top: 0;
 	}
 
-	form#wrapperSearchWidget input {
+	body > .ui-layout-north > form input {
 		height: 18px;
 		padding: 0;
 		padding-left: 3px;
diff --git a/resources/css/player.css b/resources/css/player.css
index eb519bb..c93b419 100644
--- a/resources/css/player.css
+++ b/resources/css/player.css
@@ -79,14 +79,14 @@ body > div.ui-layout-north > div:last-child > h1 {
 	height: 9px;
 }
 
-.daaprControlsWrap {
+body > .ui-layout-north > div:first-child {
 	float: left;
 	clear: left;
 	margin-top: 8px;
 	margin-left: 25px;
 }
 
-.daaprControlsWrap #buttonPlay {
+body > .ui-layout-north > div:first-child #buttonPlay {
 	float: left;
 	clear: none;
 	display: block;
@@ -96,17 +96,17 @@ body > div.ui-layout-north > div:last-child > h1 {
 	margin-right: 4px;
 	background: transparent url('../img/button_play.png') no-repeat left top;
 }
-.daaprControlsWrap #buttonPlay.playing {
+body > .ui-layout-north > div:first-child #buttonPlay.playing {
 	background-image: url('../img/button_pause.png');
 }
 
-.daaprControlsWrap #buttonPlay.stopped {
+body > .ui-layout-north > div:first-child #buttonPlay.stopped {
 	background-image: url('../img/button_stop.png');
 }
 
-.daaprControlsWrap #buttonVolume,
-.daaprControlsWrap #buttonPrev,
-.daaprControlsWrap #buttonNext {
+body > .ui-layout-north > div:first-child #buttonVolume,
+body > .ui-layout-north > div:first-child #buttonPrev,
+body > .ui-layout-north > div:first-child #buttonNext {
 	float: left;
 	clear: none;
 	display: block;
@@ -115,20 +115,20 @@ body > div.ui-layout-north > div:last-child > h1 {
 	margin-top: 3px;
 }
 
-.daaprControlsWrap #buttonPrev {
+body > .ui-layout-north > div:first-child #buttonPrev {
 	background: url('../img/button_prev.png') no-repeat left top;
 }
 
-.daaprControlsWrap #buttonNext {
+body > .ui-layout-north > div:first-child #buttonNext {
 	background: url('../img/button_next.png') no-repeat left top;
 }
 
-.daaprControlsWrap #buttonNext:active,
-.daaprControlsWrap #buttonPrev:active,
-.daaprControlsWrap #buttonPlay:active,
-.daaprControlsWrap #buttonNext.disabled:active,
-.daaprControlsWrap #buttonPrev.disabled:active,
-.daaprControlsWrap #buttonPlay.disabled:active {
+body > .ui-layout-north > div:first-child #buttonNext:active,
+body > .ui-layout-north > div:first-child #buttonPrev:active,
+body > .ui-layout-north > div:first-child #buttonPlay:active,
+body > .ui-layout-north > div:first-child #buttonNext.disabled:active,
+body > .ui-layout-north > div:first-child #buttonPrev.disabled:active,
+body > .ui-layout-north > div:first-child #buttonPlay.disabled:active {
 	background-position: left bottom;
 }
 
diff --git a/resources/templates/player/layout.html b/resources/templates/player/layout.html
index d5390e7..ffcbc11 100644
--- a/resources/templates/player/layout.html
+++ b/resources/templates/player/layout.html
@@ -1,4 +1,4 @@
-<div class="daaprControlsWrap">
+<div>
 	<a id="buttonPrev" class="disabled"></a>
 	<a id="buttonPlay" class="disabled"></a>
 	<a id="buttonNext" class="disabled"></a>
@@ -9,7 +9,7 @@
 	</div>
 	<div class="clearfix"></div>
 </div>
-<form action="#" class="form-search controls" id="wrapperSearchWidget">
+<form action="#" class="form-search controls">
 	<div class="input-prepend">
 		<button type="submit" tabindex="-1" class="btn"><i class="icon-search"></i></button>
 		<input type="text" tabindex="1" class="span3 search-query">