diff --git a/html/pages/apps/proxmox.inc.php b/html/pages/apps/proxmox.inc.php
index d20350a1f..ba093c791 100644
--- a/html/pages/apps/proxmox.inc.php
+++ b/html/pages/apps/proxmox.inc.php
@@ -10,7 +10,7 @@ $pmxcl = dbFetchRows("SELECT DISTINCT(`app_instance`) FROM `applications` WHERE
 
 print_optionbar_start();
 
-echo "<span style='font-weight: bold;'>Proxmox</span> &#187; ";
+echo "<span style='font-weight: bold;'>Proxmox Clusters</span> &#187; ";
 
 unset($sep);
 
@@ -19,7 +19,7 @@ foreach ($pmxcl as $pmxc) {
         echo $sep;
     };
 
-    if (var_eq('instance', $pmxc['app_instance'])) {
+    if (var_eq('instance', $pmxc['app_instance']) || (!isset($vars['instance']) && !isset($sep))) {
         echo "<span class='pagemenu-selected'>";
     }
 
@@ -34,27 +34,33 @@ foreach ($pmxcl as $pmxc) {
 
 print_optionbar_end();
 
-echo '<div class="container"><div class="row"><div class="col-md-12">';
-
-if (!isset($vars['instance'])) {
-    echo 'Select a cluster:';
-    echo '<ul>';
-    foreach ($pmxcl as $pmxc) {
-        echo '<li>'.generate_link(nicecase($pmxc['app_instance']), array('page' => 'apps', 'app' => 'proxmox', 'instance' => $pmxc['app_instance'])).'</li>';
-    }
-    echo '</ul>';
-}
-elseif (!isset($vars['vmid'])) {
-    echo '<ul>';
-    foreach (proxmox_cluster_vms(var_get('instance')) as $pmxvm) {
-        echo '<li>'.generate_link($pmxvm['vmid']." (".$pmxvm['description'].")", array('page' => 'apps', 'app' => 'proxmox', 'instance' => var_get('instance'), 'vmid' => $pmxvm['vmid'])).'</li>';
-    }
-    echo '</ul>';
-}
-else {
-    include("pages/apps/proxmox/vm.inc.php");
-}
-
-echo '</div></div></div>';
-
 $pagetitle[] = 'Proxmox';
+$pagetitle[] = $instance;
+
+if (!isset($vars['vmid'])) {
+    $instance = $pmxcl[0]['app_instance'];
+} else {
+    $instance = var_get('instance');
+}
+
+if (isset($vars['vmid'])) {
+    include("pages/apps/proxmox/vm.inc.php");
+    $pagetitle[] = $vars['vmid'];
+} else {
+    echo '
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="row">';
+    foreach (proxmox_cluster_vms($instance) as $pmxvm) {
+        echo '
+                <div class="col-sm-4 col-md-3 col-lg-2">'.generate_link($pmxvm['vmid']." (".$pmxvm['description'].")", array('page' => 'apps', 'app' => 'proxmox', 'instance' => $instance, 'vmid' => $pmxvm['vmid'])).'</div>';
+    }
+    echo '
+            </div>
+        </div>
+    </div>
+</div>
+';
+}
+