diff --git a/www/themes/Gentele/templates/viewmoviefull.tpl b/www/themes/Gentele/templates/viewmoviefull.tpl
index 604f51c8e..c56a80d64 100755
--- a/www/themes/Gentele/templates/viewmoviefull.tpl
+++ b/www/themes/Gentele/templates/viewmoviefull.tpl
@@ -176,21 +176,34 @@
 												<td class="less mid"
 													title="{$mpostdate[$m@index]}">{$mpostdate[$m@index]|timeago}</td>
 												<td class="less right">{$msize[$m@index]|fsize_format:"MB"}</td>
-												<td class="icons">
-													<a title="Download NZB"
-													   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}"><i
-																class="icon icon_nzb fa fa-cloud-download text-muted"
+												<td>
+													<a href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}" class="icon_nzb text-muted"><i
+																class="fa fa-cloud-download text-muted"
 																data-toggle="tooltip" data-placement="top" title
 																data-original-title="Download NZB"></i></a>
-													<a href="#" class="icon_cart text-muted" data-toggle="tooltip"
-													   data-placement="top" title
-													   data-original-title="Send to my Download Basket"><i
-																class="fa fa-shopping-basket"></i></a>
+													<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
+																class="fa fa-comments-o text-muted"
+																data-toggle="tooltip" data-placement="top" title
+																data-original-title="Comments"></i></a>
+													<a href="#"><i
+																id="cart{$result.guid}"
+																class="icon_cart text-muted fa fa-shopping-basket" data-toggle="tooltip"
+																data-placement="top" title
+																data-original-title="Send to my download basket"></i></a>
 													{if isset($sabintegrated) && $sabintegrated !=""}
-														<a href="#" class="icon icon_sab text-muted"
-														   data-toggle="tooltip" data-placement="top" title
-														   data-original-title="Send to Queue"><i
-																	class="fa fa-share"></i></a>
+														<a href="#">
+															<i	id="send{$result.guid}"
+																  class="icon_sab text-muted fa fa-share"
+																  data-toggle="tooltip"
+																  data-placement="top" title
+																  data-original-title="Send to my Queue">
+															</i>
+														</a>
+													{/if}
+													{if $weHasVortex}
+														<a href="#" class="icon_vortex text-muted"><i
+																	class="fa fa-share" data-toggle="tooltip" data-placement="top"
+																	title data-original-title="Send to NZBVortex"></i></a>
 													{/if}
 												</td>
 											</tr>
diff --git a/www/themes/Gentele/templates/viewseries.tpl b/www/themes/Gentele/templates/viewseries.tpl
index 904c47125..400fd9ca0 100755
--- a/www/themes/Gentele/templates/viewseries.tpl
+++ b/www/themes/Gentele/templates/viewseries.tpl
@@ -211,31 +211,34 @@
 															<td>
 																{$result.size|fsize_format:"MB"}
 															</td>
-															<td class="icons" style='width:100px;'>
-																<a title="Download NZB"
-																   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}"><i
-																			class="icon icon_nzb fa fa-cloud-download text-muted"
-																			data-toggle="tooltip" data-placement="top"
-																			title
+															<td>
+																<a href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}" class="icon_nzb text-muted"><i
+																			class="fa fa-cloud-download text-muted"
+																			data-toggle="tooltip" data-placement="top" title
 																			data-original-title="Download NZB"></i></a>
-																<a href="#" class="icon_cart text-muted"
-																   data-toggle="tooltip" data-placement="top" title
-																   data-original-title="Send to my Download Basket"><i
-																			class="fa fa-shopping-basket"></i></a>
+																<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
+																			class="fa fa-comments-o text-muted"
+																			data-toggle="tooltip" data-placement="top" title
+																			data-original-title="Comments"></i></a>
+																<a href="#"><i
+																			id="cart{$result.guid}"
+																			class="icon_cart text-muted fa fa-shopping-basket" data-toggle="tooltip"
+																			data-placement="top" title
+																			data-original-title="Send to my download basket"></i></a>
 																{if isset($sabintegrated) && $sabintegrated !=""}
-																	<a href="#" class="icon icon_sab text-muted"
-																	   data-toggle="tooltip" data-placement="top" title
-																	   data-original-title="Send to Queue"><i
-																				class="fa fa-share"></i></a
+																	<a href="#">
+																		<i	id="send{$result.guid}"
+																			  class="icon_sab text-muted fa fa-share"
+																			  data-toggle="tooltip"
+																			  data-placement="top" title
+																			  data-original-title="Send to my Queue">
+																		</i>
+																	</a>
 																{/if}
-																{if isset($isadmin)}
-																	<br/>
-																	<a class="label label-warning"
-																	   href="{$smarty.const.WWW_TOP}/admin/release-edit.php?id={$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
-																	   title="Edit Release">Edit</a>
-																	<a class="label label-danger"
-																	   href="{$smarty.const.WWW_TOP}/admin/release-delete.php?id={$result.id}&amp;from={$smarty.server.REQUEST_URI|escape:"url"}"
-																	   title="Delete Release">Delete</a>
+																{if $weHasVortex}
+																	<a href="#" class="icon_vortex text-muted"><i
+																				class="fa fa-share" data-toggle="tooltip" data-placement="top"
+																				title data-original-title="Send to NZBVortex"></i></a>
 																{/if}
 															</td>
 														</tr>
diff --git a/www/themes/Gentele/templates/viewxxxfull.tpl b/www/themes/Gentele/templates/viewxxxfull.tpl
index e480cc8bf..51a44d034 100755
--- a/www/themes/Gentele/templates/viewxxxfull.tpl
+++ b/www/themes/Gentele/templates/viewxxxfull.tpl
@@ -170,21 +170,34 @@
 												<td class="less mid"
 													title="{$mpostdate[$m@index]}">{$mpostdate[$m@index]|timeago}</td>
 												<td class="less right">{$msize[$m@index]|fsize_format:"MB"}</td>
-												<td class="icons">
-													<a title="Download NZB"
-													   href="{$smarty.const.WWW_TOP}/getnzb/{$mguid[$m@index]}"><i
-																class="icon icon_nzb fa fa-cloud-download text-muted"
+												<td>
+													<a href="{$smarty.const.WWW_TOP}/getnzb/{$result.guid}" class="icon_nzb text-muted"><i
+																class="fa fa-cloud-download text-muted"
 																data-toggle="tooltip" data-placement="top" title
 																data-original-title="Download NZB"></i></a>
-													<a href="#" class="icon_cart text-muted" data-toggle="tooltip"
-													   data-placement="top" title
-													   data-original-title="Send to my Download Basket"><i
-																class="fa fa-shopping-basket"></i></a>
+													<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/#comments"><i
+																class="fa fa-comments-o text-muted"
+																data-toggle="tooltip" data-placement="top" title
+																data-original-title="Comments"></i></a>
+													<a href="#"><i
+																id="cart{$result.guid}"
+																class="icon_cart text-muted fa fa-shopping-basket" data-toggle="tooltip"
+																data-placement="top" title
+																data-original-title="Send to my download basket"></i></a>
 													{if isset($sabintegrated) && $sabintegrated !=""}
-														<a href="#" class="icon icon_sab text-muted"
-														   data-toggle="tooltip" data-placement="top" title
-														   data-original-title="Send to Queue"><i
-																	class="fa fa-share"></i></a>
+														<a href="#">
+															<i	id="send{$result.guid}"
+																  class="icon_sab text-muted fa fa-share"
+																  data-toggle="tooltip"
+																  data-placement="top" title
+																  data-original-title="Send to my Queue">
+															</i>
+														</a>
+													{/if}
+													{if $weHasVortex}
+														<a href="#" class="icon_vortex text-muted"><i
+																	class="fa fa-share" data-toggle="tooltip" data-placement="top"
+																	title data-original-title="Send to NZBVortex"></i></a>
 													{/if}
 												</td>
 											</tr>