diff --git a/app/components/k8s/container-section/template.hbs b/app/components/k8s/container-section/template.hbs
index 5da215c62..d1c80a190 100644
--- a/app/components/k8s/container-section/template.hbs
+++ b/app/components/k8s/container-section/template.hbs
@@ -1,5 +1,5 @@
 {{#if model.length}}
-  <table class="table fixed no-lines r-mb0">
+  <table class="grid fixed no-lines r-mb0">
     <thead>
       <tr>
         <th>Container Name</th>
diff --git a/app/components/k8s/pod-row/template.hbs b/app/components/k8s/pod-row/template.hbs
index a845db1fc..e9cb561c4 100644
--- a/app/components/k8s/pod-row/template.hbs
+++ b/app/components/k8s/pod-row/template.hbs
@@ -20,7 +20,7 @@
   </td>
 </tr>
 {{#if expanded}}
-  <tr>
+  <tr class="nohover">
     <td colspan="6" class="subtable">
       {{k8s/container-section model=model.displayContainers}}
     </td>
diff --git a/app/components/modal-shell/component.js b/app/components/modal-shell/component.js
index 73880f54c..802b2d92f 100644
--- a/app/components/modal-shell/component.js
+++ b/app/components/modal-shell/component.js
@@ -1,8 +1,13 @@
 import Ember from 'ember';
 
+const DEFAULT_COMMAND = ["/bin/sh","-c",'TERM=xterm-256color; export TERM; [ -x /bin/bash ] && ([ -x /usr/bin/script ] && /usr/bin/script -q -c "/bin/bash" /dev/null || exec /bin/bash) || exec /bin/sh'];
+
 export default Ember.Component.extend({
   originalModel: null,
   instance: Ember.computed.alias('originalModel'),
+  command: null, // defaults to DEFAULT_COMMAND
+  showHeader: true,
+  showClose: true,
 
   status: 'Connecting...',
   socket: null,
@@ -28,7 +33,7 @@ export default Ember.Component.extend({
       attachStdin: true,
       attachStdout: true,
       tty: true,
-      command: ["/bin/sh","-c",'TERM=xterm-256color; export TERM; [ -x /bin/bash ] && ([ -x /usr/bin/script ] && /usr/bin/script -q -c "/bin/bash" /dev/null || exec /bin/bash) || exec /bin/sh'],
+      command: this.get('command') || DEFAULT_COMMAND,
     };
 
     instance.doAction('execute',opt).then((exec) => {
diff --git a/app/components/modal-shell/template.hbs b/app/components/modal-shell/template.hbs
index 17306b607..f1dcd928c 100644
--- a/app/components/modal-shell/template.hbs
+++ b/app/components/modal-shell/template.hbs
@@ -1,7 +1,13 @@
+{{#if showHeader}}
 <h2><i class="icon icon-terminal"></i> Shell: {{instance.displayName}}</h2>
+{{else}}
+  {{yield}}
+{{/if}}
 <div class="shell-body clearfix">
 </div>
 <div class="footer-actions">
   <div class="console-status text-muted">{{status}}</div>
-  <button {{action "cancel"}} class="btn btn-primary">Close</button>
+  {{#if showClose}}
+    <button {{action "cancel"}} class="btn btn-primary">Close</button>
+  {{/if}}
 </div>
diff --git a/app/components/tooltip-element/component.js b/app/components/tooltip-element/component.js
index afea02b6d..e134e0eca 100644
--- a/app/components/tooltip-element/component.js
+++ b/app/components/tooltip-element/component.js
@@ -26,6 +26,11 @@ export default Ember.Component.extend({
   },
 
   show(node) {
+    if ( this._state === 'destroying' )
+    {
+      return;
+    }
+
     var svc = this.get('tooltipService');
 
     this.set('showTimer', null);
diff --git a/app/k8s-tab/kubectl/route.js b/app/k8s-tab/kubectl/route.js
new file mode 100644
index 000000000..907094485
--- /dev/null
+++ b/app/k8s-tab/kubectl/route.js
@@ -0,0 +1,38 @@
+import Ember from 'ember';
+import C from 'ui/utils/constants';
+
+export default Ember.Route.extend({
+  k8s: Ember.inject.service(),
+
+  model() {
+    return this.get('store').findAll('container').then((containers) => {
+      let inst = null;
+      for ( let i = 0 ; i < containers.get('length') ; i++)
+      {
+        let container = containers.objectAt(i);
+        if ( container.get('state') !== 'running' )
+        {
+          continue;
+        }
+
+        var labels = container.get('labels')||{};
+        if ( labels[C.LABEL.K8S_KUBECTL]+'' === 'true' )
+        {
+          inst = container;
+          break;
+        }
+      }
+
+      if ( inst )
+      {
+        return Ember.Object.create({
+          instance: inst,
+        });
+      }
+      else
+      {
+        return Ember.RSVP.reject('Unable to find an active kubectld container');
+      }
+    });
+  },
+});
diff --git a/app/k8s-tab/kubectl/template.hbs b/app/k8s-tab/kubectl/template.hbs
new file mode 100644
index 000000000..dc6f19100
--- /dev/null
+++ b/app/k8s-tab/kubectl/template.hbs
@@ -0,0 +1,11 @@
+<section class="header">
+  <h1 style="display: block">kubectl</h1>
+  <p class="help-block">Use this shell to directly execute <code>kubectl</code> commands.</p>
+</section>
+<div class="r-m20">
+  {{modal-shell
+    originalModel=model.instance
+    showHeader=false
+    showClose=false
+  }}
+</div>
diff --git a/app/k8s-tab/namespace/pods/pod/template.hbs b/app/k8s-tab/namespace/pods/pod/template.hbs
index cd4dc2fa6..2784d4ae5 100644
--- a/app/k8s-tab/namespace/pods/pod/template.hbs
+++ b/app/k8s-tab/namespace/pods/pod/template.hbs
@@ -14,11 +14,11 @@
 </section>
 
 <section>
-  <ul class="nav nav-tabs nav-tabs-well shadowed">
+  <ul class="nav nav-tabs nav-tabs-well">
     <li role="presentation" class="tab" data-section="containers" {{action "selectTab" "containers" target="view"}}><a href="#">Containers</a></li>
   </ul>
 
-  <div class="horizontal-form well">
+  <div class="horizontal-form well nav-well">
     <div class="section container-fluid" data-section="containers">
       {{k8s/container-section model=model.displayContainers}}
     </div>
diff --git a/app/k8s-tab/namespace/pods/pod/view.js b/app/k8s-tab/namespace/pods/pod/view.js
new file mode 100644
index 000000000..20e7e0fe7
--- /dev/null
+++ b/app/k8s-tab/namespace/pods/pod/view.js
@@ -0,0 +1,8 @@
+import Ember from 'ember';
+import SelectTab from 'ui/mixins/select-tab';
+
+export default Ember.View.extend(SelectTab, {
+  didInsertElement() {
+    this.send('selectTab', 'containers');
+  },
+});
diff --git a/app/k8s-tab/namespace/rcs/rc/view.js b/app/k8s-tab/namespace/rcs/rc/view.js
new file mode 100644
index 000000000..c9155bb20
--- /dev/null
+++ b/app/k8s-tab/namespace/rcs/rc/view.js
@@ -0,0 +1,8 @@
+import Ember from 'ember';
+import SelectTab from 'ui/mixins/select-tab';
+
+export default Ember.View.extend(SelectTab, {
+  didInsertElement() {
+    this.send('selectTab', 'pods');
+  },
+});
diff --git a/app/k8s-tab/namespace/services/service/template.hbs b/app/k8s-tab/namespace/services/service/template.hbs
index e90f03bc4..15ed9b90f 100644
--- a/app/k8s-tab/namespace/services/service/template.hbs
+++ b/app/k8s-tab/namespace/services/service/template.hbs
@@ -33,13 +33,13 @@
 </section>
 
 <section>
-  <ul class="nav nav-tabs nav-tabs-well shadowed">
+  <ul class="nav nav-tabs nav-tabs-well">
     <li role="presentation" class="tab" data-section="pods" {{action "selectTab" "pods" target="view"}}><a href="#">Pods</a></li>
     <li role="presentation" class="tab" data-section="labels" {{action "selectTab" "labels" target="view"}}><a href="#">Labels</a></li>
     <li role="presentation" class="tab" data-section="ports" {{action "selectTab" "ports" target="view"}}><a href="#">Ports</a></li>
   </ul>
 
-  <div class="horizontal-form well">
+  <div class="horizontal-form well nav-well">
     <div class="section container-fluid" data-section="pods">
       {{k8s/pod-section model=model.selectedPods}}
     </div>
diff --git a/app/router.js b/app/router.js
index 1e43a7689..0a8fb3a20 100644
--- a/app/router.js
+++ b/app/router.js
@@ -145,6 +145,7 @@ Router.map(function() {
         this.route('index', {path: '/'});
 
         this.route('apply', {path: '/apply'});
+        this.route('kubectl', {path: '/kubectl'});
 
         this.route('namespaces', {path: '/namespaces'}, function() {
           this.route('index', {path: '/'});
diff --git a/app/templates/tabs/k8s-tab.hbs b/app/templates/tabs/k8s-tab.hbs
index c1ebbf895..282fbaebf 100644
--- a/app/templates/tabs/k8s-tab.hbs
+++ b/app/templates/tabs/k8s-tab.hbs
@@ -1,3 +1,4 @@
 {{#link-to "k8s-tab.namespace.services" namespace.id}}<i class="icon icon-compass"></i>Services{{/link-to}}
 {{#link-to "k8s-tab.namespace.rcs" namespace.id}}<i class="icon icon-tachometer"></i>RCs{{/link-to}}
 {{#link-to "k8s-tab.namespace.pods" namespace.id}}<i class="icon icon-containers"></i>Pods{{/link-to}}
+{{#link-to "k8s-tab.kubectl"}}<i class="icon icon-terminal"></i>kubectl{{/link-to}}