--- a/src/templates/player.html	Thu Mar 08 18:38:46 2012 +0100
+++ b/src/templates/player.html	Fri Mar 09 17:29:23 2012 +0100
@@ -1,20 +1,28 @@
 {{! template for the radio player }}
 <div class='Ldt-controler'>
 	<div class='Ldt-LeftPlayerControls'>
-    <div class='Ldt-button Ldt-CtrlPlay Ldt-CtrlPlay-PlayState Ldt-TraceMe' title='Play/Pause'></div>
-		<div class='Ldt-button Ldt-CtrlAnnotate Ldt-TraceMe' title='Annotate'></div>
-    <div class='Ldt-button Ldt-CtrlSearch Ldt-TraceMe' title='Search'></div>
-    <div class='LdtSearch'>
-      <input class='LdtSearchInput Ldt-TraceMe' style='margin-top: 2px; margin-bottom: 2px;'></input>
-    </div>
-    
+        <div class='Ldt-Ctrl-button Ldt-CtrlPlay Ldt-CtrlPlay-PlayState Ldt-TraceMe' title='Play/Pause'></div>
+        <div class='Ldt-Ctrl-spacer'></div>
+        {{^disable_annotate_btn}}
+    	<div class='Ldt-Ctrl-button Ldt-CtrlAnnotate Ldt-TraceMe' title='Annotate'></div>
+        <div class='Ldt-Ctrl-spacer'></div>
+        {{/disable_annotate_btn}}
+        {{^disable_search_btn}}
+        <div class='Ldt-Ctrl-button Ldt-CtrlSearch Ldt-TraceMe' title='Search'></div>
+        {{/disable_search_btn}}
+        <div class='Ldt-Ctrl-spacer'></div>
+        <div class='LdtSearch'>
+          <input class='LdtSearchInput Ldt-TraceMe'></input>
+        </div>
 	</div>
 	<div class='Ldt-RightPlayerControls'>
-    <div class='Ldt-Time'>
-      <div class='Ldt-ElapsedTime' title='Elapsed time'>00:00</div>
-      <div class='Ldt-TimeSeparator'>/</div>
-      <div class='Ldt-TotalTime' title='Total time'>00:00</div>
-    </div>
-		<div class='Ldt-button Ldt-CtrlSound Ldt-CtrlSound-MuteState Ldt-TraceMe' title='Mute/Unmute'></div>
+        <div class='Ldt-Ctrl-spacer'></div>
+        <div class='Ldt-Time'>
+          <div class='Ldt-ElapsedTime' title='Elapsed time'>00:00</div>
+          <div class='Ldt-TimeSeparator'>/</div>
+          <div class='Ldt-TotalTime' title='Total time'>00:00</div>
+        </div>
+        <div class='Ldt-Ctrl-spacer'></div>
+		<div class='Ldt-Ctrl-button Ldt-CtrlSound Ldt-CtrlSound-MuteState Ldt-TraceMe' title='Mute/Unmute'></div>
 	</div>
 </div>