Index: branches/1.0.x/elements/search.elm.tpl
===================================================================
diff -u -N -r15015 -r15119
--- branches/1.0.x/elements/search.elm.tpl	(.../search.elm.tpl)	(revision 15015)
+++ branches/1.0.x/elements/search.elm.tpl	(.../search.elm.tpl)	(revision 15119)
@@ -8,23 +8,20 @@
 	</form>
 </div>-->
 
-<div style="float: right; margin-top: 7px;">
-	<div style="position: absolute; z-index: 150; margin-left: -150px;">
-		<div class="search-box-small<inp2:m_ifnot check='m_Get' name='keywords'> search-box-small-noactive</inp2:m_ifnot>" >
-			<form id="search_form" action="<inp2:m_Link template='elements/ajax/search_results'/>">
-				<inp2:m_if check='m_Get' name='keywords'>
-					<input type="text" id="search-box-small-input" name="keywords" value="<inp2:m_Get name='keywords'/>" autocomplete="off"/><img src="<inp2:m_TemplatesBase/>img/search_clear.gif" width="13" height="13" alt="" border="0" class="search-box-small-clear search-clear" />
-				<inp2:m_else/>
-					<input type="text" id="search-box-small-input" name="keywords" value="Search" autocomplete="off"/><img src="<inp2:m_TemplatesBase/>img/search_clear.gif" width="13" height="13" alt="" border="0" class="search-box-small-clear search-clear" />
-				</inp2:m_if>
-			</form>
-		</div>
-
-		<div class="search-box-small-results" style="display: none;">
-			<div class="search-box-small-header"></div>
-			<div class="search-box-small-footer"></div>
-		</div>
+<div class="right">
+	<div class="search-box-small<inp2:m_ifnot check='m_Get' name='keywords'> search-box-small-noactive</inp2:m_ifnot>" >
+		<form id="search_form" action="<inp2:m_Link template='elements/ajax/search_results'/>">
+			<inp2:m_if check='m_Get' name='keywords'>
+				<input type="text" id="search-box-small-input" name="keywords" value="<inp2:m_Get name='keywords'/>" autocomplete="off"/><img src="<inp2:m_TemplatesBase/>img/search_clear.gif" width="13" height="13" alt="" border="0" class="search-box-small-clear search-clear" />
+			<inp2:m_else/>
+				<input type="text" id="search-box-small-input" name="keywords" value="Search" autocomplete="off"/><img src="<inp2:m_TemplatesBase/>img/search_clear.gif" width="16" height="16" alt="" border="0" class="search-box-small-clear search-clear" />
+			</inp2:m_if>
+		</form>
 	</div>
+	<div class="search-box-small-results" style="display: none;">
+		<div class="search-box-small-header"></div>
+		<div class="search-box-small-footer"></div>
+	</div>
 </div>
 
 <script type="text/javascript">