diff --git a/src/Jackett/Content/custom.css b/src/Jackett/Content/custom.css
index 92617dd1a47e9582c4d068f9988037944b3a5fa0..20c3ed100267228fff3191b4721539bdb60fd931 100644
--- a/src/Jackett/Content/custom.css
+++ b/src/Jackett/Content/custom.css
@@ -42,14 +42,17 @@
    text-align: center;
 }
 
-    #unconfigured-indexers .card {
-     width: 200px;
-    }
+#unconfigured-indexers .card {
+    width: 200px;
+    position: relative;
+}
 
 .unconfigured-indexer {
-    height: 120px;
+    height: 70px;
 }
 
+
+
 .indexer {
     height: 252px;
 }
@@ -62,16 +65,20 @@
     padding-bottom: 5px;
 }
 
-    .indexer-logo > .hidden-name {
-        position: absolute;
-        color: rgba(255, 255, 255, 0);
-        left: 0;
-    }
+.indexer-logo > .hidden-name {
+    position: absolute;
+    color: rgba(255, 255, 255, 0);
+    left: 0;
+}
 
-    .indexer-logo > img {
-        width: 100%;
-        border-bottom: 1px solid #FFF;
-    }
+.indexer-logo  img {
+    width: 100%;
+    border-bottom: 1px solid #FFF;
+}
+
+#unconfigured-indexers .indexer-logo  img {
+    cursor: pointer;
+}
 
 .indexer-name > h3 {
     margin-top: 13px;
@@ -82,10 +89,9 @@
     text-align: center;
 }
 
-    .indexer-buttons > .btn {
-        margin-bottom: 2px;
-    }
-
+.indexer-buttons > .btn {
+    margin-bottom: 2px;
+}
 
 .indexer-button-test {
     width: 60px;
diff --git a/src/Jackett/Content/custom.js b/src/Jackett/Content/custom.js
index 19b8f5c0e3f61319c9b72e1d1ed9c59de5f8e1e9..4832911ca780a0f46d85827a17f259956ddfc581 100644
--- a/src/Jackett/Content/custom.js
+++ b/src/Jackett/Content/custom.js
@@ -72,9 +72,10 @@ function displayIndexers(items) {
         $('.indexer-setup').each(function (i, btn) {
             var $btn = $(btn);
             var id = $btn.data("id");
+            var link = $btn.data("link");
             $btn.click(function () {
                 $('#select-indexer-modal').modal('hide').on('hidden.bs.modal', function (e) {
-                    displayIndexerSetup(id);
+                    displayIndexerSetup(id, link);
                 });
             });
         });
@@ -111,8 +112,9 @@ function prepareSetupButtons() {
     $('.indexer-setup').each(function (i, btn) {
         var $btn = $(btn);
         var id = $btn.data("id");
+        var link = $btn.data("link");
         $btn.click(function () {
-            displayIndexerSetup(id);
+            displayIndexerSetup(id, link);
         });
     });
 }
@@ -137,7 +139,7 @@ function prepareTestButtons() {
     });
 }
 
-function displayIndexerSetup(id) {
+function displayIndexerSetup(id, link) {
 
     var jqxhr = $.post("/admin/get_config_form", JSON.stringify({ indexer: id }), function (data) {
         if (data.result == "error") {
@@ -145,7 +147,7 @@ function displayIndexerSetup(id) {
             return;
         }
 
-        populateSetupForm(id, data.name, data.config, data.caps);
+        populateSetupForm(id, data.name, data.config, data.caps, link);
 
     }).fail(function () {
         doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
@@ -196,9 +198,9 @@ function populateConfigItems(configForm, config) {
     }
 }
 
-function newConfigModal(title, config, caps) {
+function newConfigModal(title, config, caps, link) {
     var configTemplate = Handlebars.compile($("#jackett-config-setup-modal").html());
-    var configForm = $(configTemplate({ title: title, caps: caps }));
+    var configForm = $(configTemplate({ title: title, caps: caps, link:link }));
     $("#modals").append(configForm);
     populateConfigItems(configForm, config);
     return configForm;
@@ -234,8 +236,8 @@ function getConfigModalJson(configForm) {
     return configJson;
 }
 
-function populateSetupForm(indexerId, name, config, caps) {
-    var configForm = newConfigModal(name, config, caps);
+function populateSetupForm(indexerId, name, config, caps, link) {
+    var configForm = newConfigModal(name, config, caps, link);
     var $goButton = configForm.find(".setup-indexer-go");
     $goButton.click(function () {
         var data = { indexer: indexerId, name: name };
diff --git a/src/Jackett/Content/index.html b/src/Jackett/Content/index.html
index 2f3f5fcfe799f5c8317636c4d1a0cec8e3985942..51591b9c082a318ff4b86eae4fbdfa8a7ec8ae52 100644
--- a/src/Jackett/Content/index.html
+++ b/src/Jackett/Content/index.html
@@ -175,7 +175,7 @@
                 <img alt="{{name}}" title="{{name}}" src="../../logos/{{id}}.png" />
             </div>
             <div class="indexer-buttons">
-                <button class="btn btn-primary btn-sm indexer-setup" data-id="{{id}}">
+                <button class="btn btn-primary btn-sm indexer-setup" data-id="{{id}}" data-link="{{site_link}}">
                     <span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>
                 </button>
                 <button class="btn btn-danger btn-sm indexer-button-delete" data-id="{{id}}">
@@ -203,14 +203,11 @@
     </script>
     <script id="unconfigured-indexer" type="text/x-handlebars-template">
         <div class="unconfigured-indexer card">
-            <div class="indexer-logo">
+            <div class="indexer-logo indexer-setup" data-id="{{id}}" data-link="{{site_link}}">
                 <!-- Make section browser searchable -->
                 <span class="hidden-name">{{name}}</span>
                 <img alt="{{name}}" title="{{name}}" src="../../logos/{{id}}.png" />
-            </div>
-            <div class="indexer-buttons">
-                <a class="btn btn-info" target="_blank" href="{{site_link}}">Visit <span class="glyphicon glyphicon-new-window" aria-hidden="true"></span></a>
-                <button class="indexer-setup btn btn-success" data-id="{{id}}">Setup <span class="glyphicon glyphicon-ok" aria-hidden="true"></span></button>
+              
             </div>
         </div>
     </script>
@@ -437,7 +434,7 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <h4 class="modal-title">{{title}}</h4>
+                            <h4 class="modal-title">{{title}} - <a target="_blank" href="{{link}}">{{link}}</a></h4>
                     </div>
                     <div class="modal-body">
                         <form class="config-setup-form"></form>