diff --git a/www/templates/charisma/views/frontend/movies.tpl b/www/templates/charisma/views/frontend/movies.tpl
index eb7afdd69..cbb3849fd 100644
--- a/www/templates/charisma/views/frontend/movies.tpl
+++ b/www/templates/charisma/views/frontend/movies.tpl
@@ -114,11 +114,16 @@
 																<span class="release-title"><a class="text-muted"
 																							   href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}">{$result.title|escape:"htmlall"}</a></span>
 
-													<div class="release-subtitle">{if $result.genre != ''}<b>Genre: </b>{$result.genre}, {/if}</div>
+													<div class="release-subtitle">{if $result.genre != ''}
+															<b>Genre: </b>
+															{$result.genre}, {/if}</div>
 													<div class="release-subtitle">{if $result.plot != ''}{$result.plot} {/if}</div>
-													<div class="release-subtitle">{if $result.director != ''}<b>Director: </b>{$result.director} {/if}</div>
-													<div class="release-subtitle">{if $result.actors != ''}<b>Starring: </b>{$result.actors} {/if}</div>
-													<div>
+													<div class="release-subtitle">{if $result.director != ''}<b>Director: </b>{$result.director} {/if}
+													</div>
+													<div class="release-subtitle">{if $result.actors != ''}
+															<b>Starring: </b>
+															{$result.actors} {/if}</div>
+													<div id="guid{$mguid[$m@index]}">
 														<span class="label label-primary">{if isset($catsplit[0])} {$catsplit[0]}{/if}</span>
 														<span class="label label-danger">{if isset($catsplit[1])} {$catsplit[1]}{/if}</span>
 														<span class="label label-default">{$result.year}</span>
@@ -142,10 +147,18 @@
 																		class="fa fa-comment-o"></i><span
 																		class="badge"> {$mcomments[$m@index]}
 																	Comment{if $mcomments[$m@index] != 1}s{/if}</span></a>
+															<span class="btn btn-hover btn-default btn-xs icon_cart text-muted"
+																  title="Add to Cart"><i
+																		class="fa fa-shopping-cart"></i></span>
+															{if isset($sabintegrated)}
+																<span class="btn btn-hover btn-default btn-xs icon_sab text-muted"
+																	  title="Send to my Queue"><i
+																			class="fa fa-send"></i></span>
+															{/if}
 														</div>
-														{/if}
-														{/foreach}
 													</div>
+													{/if}
+													{/foreach}
 												</div>
 											</div>
 										</div>
@@ -202,11 +215,16 @@
 																<span class="release-title"><a class="text-muted"
 																							   href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}">{$result.title|escape:"htmlall"}</a></span>
 
-													<div class="release-subtitle">{if $result.genre != ''}<b>Genre: </b>{$result.genre}, {/if}</div>
+													<div class="release-subtitle">{if $result.genre != ''}
+															<b>Genre: </b>
+															{$result.genre}, {/if}</div>
 													<div class="release-subtitle">{if $result.plot != ''}{$result.plot} {/if}</div>
-													<div class="release-subtitle">{if $result.director != ''}<b>Director: </b>{$result.director} {/if}</div>
-													<div class="release-subtitle">{if $result.actors != ''}<b>Starring: </b>{$result.actors} {/if}</div>
-													<div>
+													<div class="release-subtitle">{if $result.director != ''}<b>Director: </b>{$result.director} {/if}
+													</div>
+													<div class="release-subtitle">{if $result.actors != ''}
+															<b>Starring: </b>
+															{$result.actors} {/if}</div>
+													<div id="guid{$mguid[$m@index]}">
 														<span class="label label-primary">{if isset($catsplit[0])} {$catsplit[0]}{/if}</span>
 														<span class="label label-danger">{if isset($catsplit[1])} {$catsplit[1]}{/if}</span>
 														<span class="label label-default">{$result.year}</span>
@@ -230,10 +248,18 @@
 																		class="fa fa-comment-o"></i><span
 																		class="badge"> {$mcomments[$m@index]}
 																	Comment{if $mcomments[$m@index] != 1}s{/if}</span></a>
+															<span class="btn btn-hover btn-default btn-xs icon icon_cart text-muted"
+																  title="Add to Cart"><i
+																		class="fa fa-shopping-cart"></i></span>
+															{if isset($sabintegrated)}
+																<span class="btn btn-hover btn-default btn-xs icon icon_sab text-muted"
+																	  title="Send to my Queue"><i
+																			class="fa fa-send"></i></span>
+															{/if}
 														</div>
-														{/if}
-														{/foreach}
 													</div>
+													{/if}
+													{/foreach}
 												</div>
 											</div>
 										</div>
@@ -277,7 +303,7 @@
 												name="CP{$result.imdbid}"
 												title="Add to CouchPotato"
 												><img
-													src="{$smarty.const.WWW_TOP}/templates/charisma/images/icons/couch.png"></a>
+													src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/couch.png"></a>
 									{/if}
 									{if isset($isadmin)}
 										<input type="button"
diff --git a/www/templates/charisma/views/frontend/search.tpl b/www/templates/charisma/views/frontend/search.tpl
index 9ff59c6cb..241bf254b 100644
--- a/www/templates/charisma/views/frontend/search.tpl
+++ b/www/templates/charisma/views/frontend/search.tpl
@@ -24,46 +24,51 @@
 </div>
 <br>
 <div class="well well-sm">
-<form method="get" action="{$smarty.const.WWW_TOP}/search">
-	<div id="sbasic" class="row" style="text-align:center;{if $sadvanced} display:none;{/if}">
-		<div class="col-md-6">
-			<input id="search" class="form-control" maxlength="50" name="search" value="{$search|escape:'html'}"
-				   type="search" placeholder="What are you looking for?"/>
+	<form method="get" action="{$smarty.const.WWW_TOP}/search">
+		<div id="sbasic" class="row" style="text-align:center;{if $sadvanced} display:none;{/if}">
+			<div class="col-md-6">
+				<input id="search" class="form-control" maxlength="50" name="search" value="{$search|escape:'html'}"
+					   type="search" placeholder="What are you looking for?"/>
+			</div>
+			<div class="col-md-6">
+				<input type="hidden" name="t" value="{if $category[0]!=""}{$category[0]}{else}-1{/if}" id="search_cat"/>
+				<input type="hidden" name="search_type" value="basic" id="search_type"/>
+				<input id="search_search_button" class="btn btn-primary" type="submit" value="Search"/>
+			</div>
 		</div>
-		<div class="col-md-6">
-			<input type="hidden" name="t" value="{if $category[0]!=""}{$category[0]}{else}-1{/if}" id="search_cat"/>
-			<input type="hidden" name="search_type" value="basic" id="search_type"/>
-			<input id="search_search_button" class="btn btn-primary" type="submit" value="Search"/>
-		</div>
-	</div>
-</form>
-	</div>
+	</form>
+</div>
 <form method="get" action="{$smarty.const.WWW_TOP}/search">
 	<div id="sadvanced" {if not $sadvanced}style="display:none"{/if}>
 		<center>
-			<table class="data">
+			<table class="data table table-striped table-condensed table-responsive">
 				<tr>
 					<th><label for="searchadvr">Release Name:</label></th>
-					<td><input class="searchadv" id="searchadvr" name="searchadvr" value="{$searchadvr|escape:'html'}" type="text"></td>
+					<td><input class="searchadv" id="searchadvr" name="searchadvr" value="{$searchadvr|escape:'html'}"
+							   type="text"></td>
 				</tr>
 				<tr>
 					<th><label for="searchadvsubject">Usenet Name:</label></th>
-					<td><input class="searchadv" id="searchadvsubject" name="searchadvsubject" value="{$searchadvsubject|escape:'html'}" type="text"></td>
+					<td><input class="searchadv" id="searchadvsubject" name="searchadvsubject"
+							   value="{$searchadvsubject|escape:'html'}" type="text"></td>
 				</tr>
 				<tr>
 					<th><label for="searchadvposter">Poster:</label></th>
-					<td><input class="searchadv" id="searchadvposter" name="searchadvposter" value="{$searchadvposter|escape:'html'}" type="text"></td>
+					<td><input class="searchadv" id="searchadvposter" name="searchadvposter"
+							   value="{$searchadvposter|escape:'html'}" type="text"></td>
 				</tr>
 				<tr>
 					<th><label for="searchadvdaysnew">Min age(days):</label></th>
 					<td>
-						<input class="searchdaysinput" id="searchadvdaysnew" name="searchadvdaysnew" value="{$searchadvdaysnew|escape:'html'}" type="text">
+						<input class="searchdaysinput" id="searchadvdaysnew" name="searchadvdaysnew"
+							   value="{$searchadvdaysnew|escape:'html'}" type="text">
 					</td>
 				</tr>
 				<tr>
 					<th><label for="searchadvdaysold">Max age(days):</label></th>
 					<td>
-						<input class="searchdaysinput" id="searchadvdaysold" name="searchadvdaysold" value="{$searchadvdaysold|escape:'html'}" type="text">
+						<input class="searchdaysinput" id="searchadvdaysold" name="searchadvdaysold"
+							   value="{$searchadvdaysold|escape:'html'}" type="text">
 					</td>
 				</tr>
 				<tr>
@@ -88,6 +93,7 @@
 						<input type="checkbox" name="searchadvhasnfo" value="1">
 						<input type="hidden" name="searchadvhascomments" value="0">
 						<input type="checkbox" name="searchadvhascomments" value="1">
+
 						<div style="float:right;"><input type="hidden" name="search_type" value="adv" id="search_type">
 							<input id="search_adv_button" type="submit" value="search">
 						</div>
@@ -105,10 +111,18 @@
 			Suggestions:
 			<br><br>
 			<ul>
-				<center><li>Make sure all words are spelled correctly.</li></center>
-				<center><li>Try different keywords.</li></center>
-				<center><li>Try more general keywords.</li></center>
-				<center><li>Try fewer keywords.</li></center>
+				<center>
+					<li>Make sure all words are spelled correctly.</li>
+				</center>
+				<center>
+					<li>Try different keywords.</li>
+				</center>
+				<center>
+					<li>Try more general keywords.</li>
+				</center>
+				<center>
+					<li>Try fewer keywords.</li>
+				</center>
 			</ul>
 		</div>
 	</center>
@@ -168,94 +182,35 @@
 				{$pager}
 			</div>
 		</div>
+		<hr>
 		<table class="data table table-condensed table-striped table-responsive table-hover" id="browsetable">
-			<tr>
-				<th></th>
-				<th>
-					name<br>
-					<a title="Sort Descending" href="{$orderbyname_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbyname_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th style="text-align:center;">
-					category<br>
-					<a title="Sort Descending" href="{$orderbycat_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbycat_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th style="text-align:center;">
-					posted<br>
-					<a title="Sort Descending" href="{$orderbyposted_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbyposted_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th style="text-align:center;">
-					size<br>
-					<a title="Sort Descending" href="{$orderbysize_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbysize_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th style="text-align:center;">
-					files<br>
-					<a title="Sort Descending" href="{$orderbyfiles_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbyfiles_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th style="text-align:center;">stats<br>
-					<a title="Sort Descending" href="{$orderbystats_desc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_down.gif" alt="Sort Descending">
-					</a>
-					<a title="Sort Ascending" href="{$orderbystats_asc}">
-						<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/sorting/arrow_up.gif" alt="Sort Ascending">
-					</a>
-				</th>
-				<th>
-					<input id="chkSelectAll" type="checkbox" class="nzb_check_all">
-					<label for="chkSelectAll" style="display:none;">Select All</label>
-				</th>
-			</tr>
 			{foreach from=$results item=result}
-				<tr class="{cycle values=",alt"}{if $lastvisit|strtotime<$result.adddate|strtotime} new{/if}" id="guid{$result.guid}">
-					<td class="icons">
-						<div class="icon icon_nzb">
-							<a title="Download Nzb" href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"htmlall"}">&nbsp;</a>
-						</div>
-						<div class="icon icon_cart" title="Add to Cart"></div>
-						{if $sabintegrated}
-							<div class="icon icon_sab" title="Send to my Queue"></div>
-						{/if}
+				<tr class="{cycle values=",alt"}{if $lastvisit|strtotime<$result.adddate|strtotime} new{/if}"
+					id="guid{$result.guid}">
+					<td class="check">
+						<input id="chk{$result.guid|substr:0:7}" type="checkbox" class="nzb_check"
+							   value="{$result.guid}">
 					</td>
 					<td class="item">
 						<label for="chk{$result.guid|substr:0:7}">
-							<a class="title" title="View details" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">{$result.searchname|escape:"htmlall"|truncate:150:"...":true}</a></label value="Searchname">
+							<a class="title" title="View details"
+							   href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">{$result.searchname|escape:"htmlall"|truncate:150:"...":true}</a></label value="Searchname">
 
 						<div class="resextra">
-							<a class="browsename" title="View details" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">
-								{$result.name|escape:"htmlall"|truncate:150:"...":true}
-							</a>
 							<div class="btns" style="float:right">
 								{release_flag($result.searchname, browse)}
 								{if $result.passwordstatus == 1}
-									<img title="RAR/ZIP Possibly Passworded." src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/lock2.png" alt="RAR/ZIP Possibly Passworded.">
+									<img title="RAR/ZIP Possibly Passworded."
+										 src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/lock2.png"
+										 alt="RAR/ZIP Possibly Passworded.">
 								{elseif $result.passwordstatus == 2}
-									<img title="RAR/ZIP Possibly Damaged." src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/broken.png" alt="RAR/ZIP Possibly Damaged.">
+									<img title="RAR/ZIP Possibly Damaged."
+										 src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/broken.png"
+										 alt="RAR/ZIP Possibly Damaged.">
 								{elseif $result.passwordstatus == 10}
-									<img title="RAR/ZIP is Passworded." src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/lock.gif" alt="RAR/ZIP is Passworded.">
+									<img title="RAR/ZIP is Passworded."
+										 src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/lock.gif"
+										 alt="RAR/ZIP is Passworded.">
 								{/if}
 								{if $result.videostatus > 0}
 									<a
@@ -267,38 +222,54 @@
 									</a>
 								{/if}
 								{if $result.nfoid > 0}
-									<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}" title="View Nfo" class="modal_nfo label label-default" rel="nfo">Nfo</a>
+									<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}" title="View Nfo"
+									   class="modal_nfo label label-default" rel="nfo">Nfo</a>
 								{/if}
 								{if $result.imdbid > 0}
-									<a href="#" name="name{$result.imdbid}" title="View movie info" class="modal_imdb label label-default" rel="movie" >Cover</a>
+									<a href="#" name="name{$result.imdbid}" title="View movie info"
+									   class="modal_imdb label label-default" rel="movie">Cover</a>
 								{/if}
 								{if $result.haspreview == 1 && $userdata.canpreview == 1}
-								<a href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg" name="name{$result.guid}" title="Screenshot of {$result.searchname|escape:"htmlall"}" class="modal_prev label label-default" rel="preview">Preview</a>{/if}
+								<a href="{$smarty.const.WWW_TOP}/covers/preview/{$result.guid}_thumb.jpg"
+								   name="name{$result.guid}" title="Screenshot of {$result.searchname|escape:"htmlall"}"
+								   class="modal_prev label label-default" rel="preview">Preview</a>{/if}
 								{if $result.jpgstatus == 1 && $userdata.canpreview == 1}
-								<a href="{$smarty.const.WWW_TOP}/covers/sample/{$result.guid}_thumb.jpg" name="name{$result.guid}" title="Sample of {$result.searchname|escape:"htmlall"}" class="modal_prev label label-default" rel="preview">Sample</a>{/if}
+								<a href="{$smarty.const.WWW_TOP}/covers/sample/{$result.guid}_thumb.jpg"
+								   name="name{$result.guid}" title="Sample of {$result.searchname|escape:"htmlall"}"
+								   class="modal_prev label label-default" rel="preview">Sample</a>{/if}
 								{if $result.musicinfoid > 0}
-									<a href="#" name="name{$result.musicinfoid}" title="View music info" class="modal_music label label-default" rel="music" >Cover</a>
+									<a href="#" name="name{$result.musicinfoid}" title="View music info"
+									   class="modal_music label label-default" rel="music">Cover</a>
 								{/if}
 								{if $result.consoleinfoid > 0}
-									<a href="#" name="name{$result.consoleinfoid}" title="View console info" class="modal_console label label-default" rel="console" >Cover</a>
+									<a href="#" name="name{$result.consoleinfoid}" title="View console info"
+									   class="modal_console label label-default" rel="console">Cover</a>
 								{/if}
 								{if $result.rageid > 0}
-									<a class="label label-default" href="{$smarty.const.WWW_TOP}/series/{$result.rageid}" title="View all episodes">View Series</a>
+									<a class="label label-default"
+									   href="{$smarty.const.WWW_TOP}/series/{$result.rageid}" title="View all episodes">View
+										Series</a>
 								{/if}
 								{if $result.anidbid > 0}
-									<a class="label label-default" href="{$smarty.const.WWW_TOP}/anime/{$result.anidbid}" title="View all episodes">View Anime</a>
+									<a class="label label-default"
+									   href="{$smarty.const.WWW_TOP}/anime/{$result.anidbid}" title="View all episodes">View
+										Anime</a>
 								{/if}
 								{if $result.tvairdate != ""}
-									<span class="seriesinfo label label-default" title="{$result.guid}">Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}</span>
+									<span class="seriesinfo label label-default"
+										  title="{$result.guid}">Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}</span>
 								{/if}
 								{if $result.group_name != ""}
-									<a class="label label-default" href="{$smarty.const.WWW_TOP}/browse?g={$result.group_name|escape:"htmlall"}" title="Browse {$result.group_name}">{$result.group_name|escape:"htmlall"|replace:"alt.binaries.":"a.b."}</a>
+									<a class="label label-default"
+									   href="{$smarty.const.WWW_TOP}/browse?g={$result.group_name|escape:"htmlall"}"
+									   title="Browse {$result.group_name}">{$result.group_name|escape:"htmlall"|replace:"alt.binaries.":"a.b."}</a>
 								{/if}
 							</div>
 						</div>
 					</td>
 					<td class="category">
-						<a title="Browse {$result.category_name}" href="{$smarty.const.WWW_TOP}/browse?t={$result.categoryid}">{$result.category_name}</a>
+						<a title="Browse {$result.category_name}"
+						   href="{$smarty.const.WWW_TOP}/browse?t={$result.categoryid}">{$result.category_name}</a>
 					</td>
 					<td class="posted" title="{$result.postdate}">
 						{$result.postdate|timeago}
@@ -315,24 +286,37 @@
 						{/if}
 					</td>
 					<td class="files">
-						<a title="View file list" href="{$smarty.const.WWW_TOP}/filelist/{$result.guid}">{$result.totalpart}</a>
+						<a title="View file list"
+						   href="{$smarty.const.WWW_TOP}/filelist/{$result.guid}">{$result.totalpart}</a>
 						{if $result.rarinnerfilecount > 0}
 							<div class="rarfilelist">
-								<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/magnifier.png" alt="{$result.guid}">
+								<img src="{$smarty.const.WWW_TOP}/templates/omicron/images/icons/magnifier.png"
+									 alt="{$result.guid}">
 							</div>
 						{/if}
 					</td>
-					<td class="stats" nowrap="nowrap">
-						<a title="View comments" href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments">{$result.comments} cmt{if $result.comments != 1}s{/if}</a>
+					<td class="stats">
+						<a title="View comments"
+						   href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments">{$result.comments}
+							cmt{if $result.comments != 1}s{/if}</a>
 						<br>{$result.grabs} grab{if $result.grabs != 1}s{/if}
 					</td>
-					<td class="check">
-						<input id="chk{$result.guid|substr:0:7}" type="checkbox" class="nzb_check" value="{$result.guid}">
+					<td class="icons" nowrap="nowrap">
+						<div class="icon_nzb text-muted">
+							<a title="Download Nzb"
+							   href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}/{$result.searchname|escape:"htmlall"}">
+								&nbsp;<i class="fa fa-download"></i></a>
+						</div>
+						<div class="icon_cart text-muted" title="Add to Cart"><i class="fa fa-shopping-cart"></i></div>
+						{if $sabintegrated}
+							<div class="icon_sab text-muted" title="Send to my Queue"><i class="fa fa-send-o"></i></div>
+						{/if}
 					</td>
 				</tr>
 			{/foreach}
 		</table>
 		<br/>
+
 		<div class="row">
 			<div class="col-md-8">
 				<div class="nzb_multi_operations">
diff --git a/www/templates/omicron/views/frontend/movies.tpl b/www/templates/omicron/views/frontend/movies.tpl
index 082902c8d..cbb3849fd 100644
--- a/www/templates/omicron/views/frontend/movies.tpl
+++ b/www/templates/omicron/views/frontend/movies.tpl
@@ -114,11 +114,16 @@
 																<span class="release-title"><a class="text-muted"
 																							   href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}">{$result.title|escape:"htmlall"}</a></span>
 
-													<div class="release-subtitle">{if $result.genre != ''}<b>Genre: </b>{$result.genre}, {/if}</div>
+													<div class="release-subtitle">{if $result.genre != ''}
+															<b>Genre: </b>
+															{$result.genre}, {/if}</div>
 													<div class="release-subtitle">{if $result.plot != ''}{$result.plot} {/if}</div>
-													<div class="release-subtitle">{if $result.director != ''}<b>Director: </b>{$result.director} {/if}</div>
-													<div class="release-subtitle">{if $result.actors != ''}<b>Starring: </b>{$result.actors} {/if}</div>
-													<div>
+													<div class="release-subtitle">{if $result.director != ''}<b>Director: </b>{$result.director} {/if}
+													</div>
+													<div class="release-subtitle">{if $result.actors != ''}
+															<b>Starring: </b>
+															{$result.actors} {/if}</div>
+													<div id="guid{$mguid[$m@index]}">
 														<span class="label label-primary">{if isset($catsplit[0])} {$catsplit[0]}{/if}</span>
 														<span class="label label-danger">{if isset($catsplit[1])} {$catsplit[1]}{/if}</span>
 														<span class="label label-default">{$result.year}</span>
@@ -142,14 +147,18 @@
 																		class="fa fa-comment-o"></i><span
 																		class="badge"> {$mcomments[$m@index]}
 																	Comment{if $mcomments[$m@index] != 1}s{/if}</span></a>
-															<span class="btn btn-hover btn-default btn-xs icon_cart text-muted" title="Add to Cart"><i class="glyphicon glyphicon-shopping-cart"></i></span>
+															<span class="btn btn-hover btn-default btn-xs icon_cart text-muted"
+																  title="Add to Cart"><i
+																		class="fa fa-shopping-cart"></i></span>
 															{if isset($sabintegrated)}
-																<span class="btn btn-hover btn-default btn-xs icon_sab text-muted" title="Send to my Queue"><i class="glyphicon glyphicon-send"></i></span>
+																<span class="btn btn-hover btn-default btn-xs icon_sab text-muted"
+																	  title="Send to my Queue"><i
+																			class="fa fa-send"></i></span>
 															{/if}
 														</div>
-														{/if}
-														{/foreach}
 													</div>
+													{/if}
+													{/foreach}
 												</div>
 											</div>
 										</div>
@@ -206,11 +215,16 @@
 																<span class="release-title"><a class="text-muted"
 																							   href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}">{$result.title|escape:"htmlall"}</a></span>
 
-													<div class="release-subtitle">{if $result.genre != ''}<b>Genre: </b>{$result.genre}, {/if}</div>
+													<div class="release-subtitle">{if $result.genre != ''}
+															<b>Genre: </b>
+															{$result.genre}, {/if}</div>
 													<div class="release-subtitle">{if $result.plot != ''}{$result.plot} {/if}</div>
-													<div class="release-subtitle">{if $result.director != ''}<b>Director: </b>{$result.director} {/if}</div>
-													<div class="release-subtitle">{if $result.actors != ''}<b>Starring: </b>{$result.actors} {/if}</div>
-													<div>
+													<div class="release-subtitle">{if $result.director != ''}<b>Director: </b>{$result.director} {/if}
+													</div>
+													<div class="release-subtitle">{if $result.actors != ''}
+															<b>Starring: </b>
+															{$result.actors} {/if}</div>
+													<div id="guid{$mguid[$m@index]}">
 														<span class="label label-primary">{if isset($catsplit[0])} {$catsplit[0]}{/if}</span>
 														<span class="label label-danger">{if isset($catsplit[1])} {$catsplit[1]}{/if}</span>
 														<span class="label label-default">{$result.year}</span>
@@ -234,14 +248,18 @@
 																		class="fa fa-comment-o"></i><span
 																		class="badge"> {$mcomments[$m@index]}
 																	Comment{if $mcomments[$m@index] != 1}s{/if}</span></a>
-															<span class="btn btn-hover btn-default btn-xs icon_cart text-muted" title="Add to Cart"><i class="glyphicon glyphicon-shopping-cart"></i></span>
+															<span class="btn btn-hover btn-default btn-xs icon icon_cart text-muted"
+																  title="Add to Cart"><i
+																		class="fa fa-shopping-cart"></i></span>
 															{if isset($sabintegrated)}
-																<span class="btn btn-hover btn-default btn-xs icon_sab text-muted" title="Send to my Queue"><i class="glyphicon glyphicon-send"></i></span>
+																<span class="btn btn-hover btn-default btn-xs icon icon_sab text-muted"
+																	  title="Send to my Queue"><i
+																			class="fa fa-send"></i></span>
 															{/if}
 														</div>
-														{/if}
-														{/foreach}
 													</div>
+													{/if}
+													{/foreach}
 												</div>
 											</div>
 										</div>