diff --git a/Web/lib/MeshMage/Web.pm b/Web/lib/MeshMage/Web.pm
index 827a258..efc02f8 100644
--- a/Web/lib/MeshMage/Web.pm
+++ b/Web/lib/MeshMage/Web.pm
@@ -53,12 +53,10 @@ sub startup ($self) {
     $r->post  ('/node')              ->to('Node#create');
 
     # Deployment
-    $r->get   ('/deploy/automatic' )          ->to('Deploy::Automatic#index' );
-    $r->get   ('/deploy/automatic/:node_id' ) ->to('Deploy::Automatic#deploy');
+    $r->get   ('/deploy/automatic/:node_id' ) ->to('Deploy::Automatic#deploy')->name('deploy_automatic');
     $r->post  ('/deploy/automatic' )          ->to('Deploy::Automatic#create');
 
-    $r->get   ('/deploy/manual' )          ->to('Deploy::Manual#index' );
-    $r->get   ('/deploy/manual/:node_id' ) ->to('Deploy::Manual#deploy');
+    $r->get   ('/deploy/manual/:node_id' ) ->to('Deploy::Manual#deploy')->name('deploy_manual');
     $r->post  ('/deploy/manual' )          ->to('Deploy::Manual#create');
 
     # Manage SSH Keys
diff --git a/Web/templates/_base/sidebar.tx b/Web/templates/_base/sidebar.tx
index 98ed280..c5ee1a5 100644
--- a/Web/templates/_base/sidebar.tx
+++ b/Web/templates/_base/sidebar.tx
@@ -59,22 +59,5 @@
           </li>
         </ul>
         -->
-        <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
-          <span>Deployment</span>
-        </h6>
-        <ul class="nav flex-column mb-2">
-          <li class="nav-item">
-            <a class="nav-link [% $sb_active == "deploy_automatic" ? "active" : "" %]" href="/deploy/automatic">
-              <span data-feather="hard-drive"></span>
-              Remote Node
-            </a>
-          </li>
-
-          <li class="nav-item">
-            <a class="nav-link [% $sb_active == "deploy_manual" ? "active" : "" %]" href="/deploy/manual">
-              <span data-feather="user"></span>
-              Manual Setup
-            </a>
-          </li>
       </div>
     </nav>
diff --git a/Web/templates/dashboard/_panels/nodes_table.tx b/Web/templates/dashboard/_panels/nodes_table.tx
index 545c622..9867340 100644
--- a/Web/templates/dashboard/_panels/nodes_table.tx
+++ b/Web/templates/dashboard/_panels/nodes_table.tx
@@ -17,6 +17,14 @@
                 <td>[% $node.nebula_ip %]</td>
                 <td>[% $node.public_ip %]</td>
                 <td>
+                    <a href="[% $c.url_for( 'deploy_automatic', {'node_id', $node.id} ) %]"
+                       title="Automatically Deploy Node"
+                       ><span data-feather="upload-cloud"></span></a>
+                    &nbsp;
+                    <a href="[% $c.url_for( 'deploy_manual', {'node_id', $node.id} ) %]"
+                       title="Manually Deploy Node"
+                       ><span data-feather="download-cloud"></span></a>
+                    &nbsp;
                     <a href="[% $c.url_for( 'view_node', {'node_id', $node.id} ) %]"
                        title="View Node Details"
                        ><span data-feather="arrow-right"></span></a>
diff --git a/Web/templates/deploy/automatic/deploy.html.tx b/Web/templates/deploy/automatic/deploy.html.tx
index 21d9c3c..0738331 100644
--- a/Web/templates/deploy/automatic/deploy.html.tx
+++ b/Web/templates/deploy/automatic/deploy.html.tx
@@ -1,8 +1,16 @@
 %%  cascade _base::layout { title => "Deploy Node",
-%%      sb_active => 'deploy_automatic'
+%%      sb_active => 'dashboard'
 %%  }
 
 %% override panel -> {
+    <nav style="margin-top: 2em;" aria-label="breadcrumb">
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="[% $c.url_for( 'dashboard' ) %]">Dashboard</a></li>
+            <li class="breadcrumb-item"><a href="[% $c.url_for( 'list_nodes' ) %]">Nodes</a></li>
+            <li class="breadcrumb-item"><a href="[% $c.url_for( 'view_node', 'node_id', $node.id ) %]">[% $node.hostname %]</a></li>
+            <li class="breadcrumb-item active" aria-current="page">Automatic Deploy</li>
+        </ol>
+    </nav>
 
     <table style="margin-top: 2em" class="table">
         <thead>
diff --git a/Web/templates/deploy/manual/deploy.html.tx b/Web/templates/deploy/manual/deploy.html.tx
index 9cd8e78..e1403a9 100644
--- a/Web/templates/deploy/manual/deploy.html.tx
+++ b/Web/templates/deploy/manual/deploy.html.tx
@@ -3,6 +3,14 @@
 %%  }
 
 %% override panel -> {
+    <nav style="margin-top: 2em;" aria-label="breadcrumb">
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="[% $c.url_for( 'dashboard' ) %]">Dashboard</a></li>
+            <li class="breadcrumb-item"><a href="[% $c.url_for( 'list_nodes' ) %]">Nodes</a></li>
+            <li class="breadcrumb-item"><a href="[% $c.url_for( 'view_node', 'node_id', $node.id ) %]">[% $node.hostname %]</a></li>
+            <li class="breadcrumb-item active" aria-current="page">Automatic Deploy</li>
+        </ol>
+    </nav>
 
     <table style="margin-top: 2em" class="table">
         <thead>