diff --git a/src/templates/sub/server.phtml b/src/templates/sub/server.phtml
index f1cf79d..1545ec8 100644
--- a/src/templates/sub/server.phtml
+++ b/src/templates/sub/server.phtml
@@ -26,7 +26,10 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2);
     <div class="card mr-2 mb-2 bg-light" id="server-card-<?php echo $server['id'] ?>">
         <div class="card-body">
             <h5 class="card-title">
-				<?php echo $this->e($server['name']); ?>
+                <a href="<?php echo $this->escapeHtmlAttr($this->u($base_url)); ?>" target="_blank" title="<?php echo $this->__('Visit Server')?>">
+                    <?php echo $this->e($server['name']); ?>
+                    <i class="fa fa-external-link-alt"></i>
+                </a>
             </h5>
             <h6 class="card-subtitle mb-2 text-muted">
 				<?php if ($server['ssl_state']): ?>
@@ -75,8 +78,6 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2);
 			<?php else: ?>
                 <p class="card-text text-muted">&lt;<?php echo $this->__('No description provided')?>&gt;</p>
 			<?php endif; ?>
-            <a href="<?php echo $this->escapeHtmlAttr($this->u($base_url)); ?>" class="card-link btn btn-primary"><i class="fa fa-external-link-alt"></i>
-	            <?php echo $this->__('Visit Server')?></a>
         </div>
     </div>
 <?php /*