diff --git a/app/authenticated/project/hooks/index/controller.js b/app/authenticated/project/hooks/index/controller.js
index 2a2b7bec8..7154891be 100644
--- a/app/authenticated/project/hooks/index/controller.js
+++ b/app/authenticated/project/hooks/index/controller.js
@@ -1,8 +1,10 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-  settings:        Ember.inject.service(),
-  sortBy:          'name',
+  settings: Ember.inject.service(),
+  projects: Ember.inject.service(),
+
+  sortBy:'name',
 
   headers: [
     {
diff --git a/app/authenticated/project/hooks/index/template.hbs b/app/authenticated/project/hooks/index/template.hbs
index 29350845d..a3d362f06 100644
--- a/app/authenticated/project/hooks/index/template.hbs
+++ b/app/authenticated/project/hooks/index/template.hbs
@@ -1,24 +1,15 @@
-<div class="banner bg-info mb-0 p-0">
-  <div class="banner-icon" style="width: 68px;"><span class="icon icon-2x icon-notification"></span></div>
-  <div class="banner-message">
-    <p>
-      Experimental: More webhook features will be added in future releases, and the existing capabilities may change.
-    </p>
-  </div>
-</div>
-
 <section class="header clearfix">
   <div class="pull-left">
     <h1>{{t 'hookPage.receiver.header'}}</h1>
   </div>
 
   <div class="right-buttons">
-    {{#link-to "authenticated.project.hooks.new-receiver" class="btn btn-sm bg-primary"}}{{t 'hookPage.receiver.buttonText'}}{{/link-to}}
+    {{#link-to "authenticated.project.hooks.new-receiver" class="btn btn-sm bg-primary" disabled=projects.current.isKubernetes}}{{t 'hookPage.receiver.buttonText'}}{{/link-to}}
   </div>
 </section>
 
 <section>
-  <p>{{t 'hookPage.receiver.content' appName=settings.appName}}</p>
+  <p class="help-block">{{t 'hookPage.receiver.content' appName=settings.appName}}</p>
   {{#if model.receivers.length}}
     {{#sortable-table
         classNames="grid fixed r-mb0 mt-10 sortable-table"
@@ -39,6 +30,8 @@
         </tr>
       {{/if}}
     {{/sortable-table}}
+  {{else if projects.current.isKubernetes}}
+    <div class="m-40 text-center text-muted">Coming soon for Kubernetes clusters</div>
   {{else}}
     {{empty-table resource="container" newRoute="authenticated.project.hooks.new-receiver" newTranslationKey="hookPage.receiver.buttonText"}}
   {{/if}}
diff --git a/app/components/container/form-volumes/template.hbs b/app/components/container/form-volumes/template.hbs
index c5c8ef055..5dbdbe1bf 100644
--- a/app/components/container/form-volumes/template.hbs
+++ b/app/components/container/form-volumes/template.hbs
@@ -14,8 +14,8 @@
         <span class="darken"><i class="icon icon-chevron-down"></i></span>
       </button>
       <ul class="dropdown-menu" role="menu">
-        <li><a {{action "addVolume"}}>{{t 'formVolumes.add.existing'}}</a></li>
-        <li><a {{action "addNewVolume"}}>{{t 'formVolumes.add.new'}}</a></li>
+        <li class="disabled"><a {{!--action "addVolume"--}}>{{t 'formVolumes.add.existing'}} (Coming Soon)</a></li>
+        <li class="disabled"><a {{!--action "addNewVolume"--}}>{{t 'formVolumes.add.new'}} (Coming Soon)</a></li>
         <li><a {{action "addBindMount"}}>{{t 'formVolumes.add.bindMount'}}</a></li>
         <li><a {{action "addTmpfs"}}>{{t 'formVolumes.add.tmpfs'}}</a></li>
         {{#if isService}}
@@ -26,7 +26,7 @@
           <li><a {{action "addVolumesFromContainer"}}>{{t 'formVolumes.add.fromContainer'}}</a></li>
         {{/if}}
         <li class="divider"></li>
-        <li><a {{action "addCustom"}}>{{t 'formVolumes.add.custom'}}</a></li>
+        <li class="disabled"><a {{action "addCustom"}}>{{t 'formVolumes.add.custom'}} (Coming Soon)</a></li>
       </ul>
     </div>
 
diff --git a/app/components/containers-header/template.hbs b/app/components/containers-header/template.hbs
index c06b45f8d..2e5bb1e23 100644
--- a/app/components/containers-header/template.hbs
+++ b/app/components/containers-header/template.hbs
@@ -4,7 +4,9 @@
     <li>{{#link-to "balancers.index" projects.current.id}}{{t 'nav.containers.balancers'}}{{/link-to}}</li>
     <li>{{#link-to "dns.index" projects.current.id}}{{t 'nav.containers.dns'}}{{/link-to}}</li>
     <li>{{#link-to "volumes.index" projects.current.id}}{{t 'nav.containers.volumes'}}{{/link-to}}</li>
-    <li>{{#link-to "k8s" projects.current.id}}{{t 'nav.containers.k8s'}}{{/link-to}}</li>
+    {{#if projects.current.isKubernetes}}
+      <li>{{#link-to "k8s" projects.current.id}}{{t 'nav.containers.k8s'}}{{/link-to}}</li>
+    {{/if}}
   </ul>
 
   <div class="right-buttons">
diff --git a/app/models/project.js b/app/models/project.js
index 876681c4d..ab62f3e6f 100644
--- a/app/models/project.js
+++ b/app/models/project.js
@@ -20,6 +20,7 @@ var Project = Resource.extend(PolledResource, {
 
   canAddHost: Ember.computed.notEmpty('cluster.registrationToken.hostCommand'),
   canImport: Ember.computed.notEmpty('cluster.registrationToken.clusterCommand'),
+  isKubernetes: Ember.computed.equal('cluster.orchestration','kubernetes'),
 
   actions: {
     edit: function() {
diff --git a/app/secrets/index/controller.js b/app/secrets/index/controller.js
index d8f608678..424c6254a 100644
--- a/app/secrets/index/controller.js
+++ b/app/secrets/index/controller.js
@@ -3,6 +3,7 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
   sortBy: 'name',
   prefs: Ember.inject.service(),
+  projects: Ember.inject.service(),
 
   queryParams: ['sortBy'],
 
diff --git a/app/secrets/index/template.hbs b/app/secrets/index/template.hbs
index cf6e2c478..f4a729701 100644
--- a/app/secrets/index/template.hbs
+++ b/app/secrets/index/template.hbs
@@ -1,19 +1,10 @@
-<div class="banner bg-info mb-0 p-0">
-  <div class="banner-icon" style="width: 68px;"><span class="icon icon-2x icon-notification"></span></div>
-  <div class="banner-message">
-    <p>
-      Experimental: Compose and CLI support coming in a future release.
-    </p>
-  </div>
-</div>
-
 <section class="header clearfix">
   <div class="pull-left">
     <h1>{{t 'secretsPage.index.header'}}</h1>
   </div>
 
   <div class="right-buttons">
-    {{#link-to "secrets.new" classNames="btn btn-sm bg-primary"}}{{t 'secretsPage.index.linkTo'}}{{/link-to}}
+    {{#link-to "secrets.new" classNames="btn btn-sm bg-primary" disabled=projects.current.isKubernetes}}{{t 'secretsPage.index.linkTo'}}{{/link-to}}
   </div>
 </section>
 
@@ -39,6 +30,8 @@
         <tr><td colspan="{{sortable.fullColspan}}" class="text-center text-muted pt-20 pb-20">{{t 'secretsPage.index.noData'}}</td></tr>
       {{/if}}
     {{/sortable-table}}
+  {{else if projects.current.isKubernetes}}
+    <div class="m-40 text-center text-muted">Coming soon for Kubernetes clusters</div>
   {{else}}
     {{empty-table resource="container" newRoute="secrets.new" newTranslationKey="secretsPage.index.linkTo"}}
   {{/if}}
diff --git a/app/styles/pages/_cluster-welcome.scss b/app/styles/pages/_cluster-welcome.scss
index 02b3596d6..0b77f35d8 100644
--- a/app/styles/pages/_cluster-welcome.scss
+++ b/app/styles/pages/_cluster-welcome.scss
@@ -9,7 +9,7 @@
 
   .box {
     padding: 75px 40px 40px 40px;
-    min-height: 400px;
+    min-height: 410px;
     position: relative;
   }
 
diff --git a/app/volumes/index/template.hbs b/app/volumes/index/template.hbs
index f9cd38378..c461c05f8 100644
--- a/app/volumes/index/template.hbs
+++ b/app/volumes/index/template.hbs
@@ -3,7 +3,7 @@
 {{else}}
   {{#containers-header simpleMode=simpleMode tags=tags showGroup=false}}
     {{#link-to "new-stack" classNames="btn btn-sm bg-default mr-10"}}{{t 'nav.containers.importCompose'}}{{/link-to}}
-    {{#link-to "volumes.new" projects.current.id class="btn btn-sm bg-primary"}}{{t 'nav.containers.addVolume'}}{{/link-to}}
+    {{#link-to "volumes.new" projects.current.id class="btn btn-sm bg-primary" disabled=projectController.projects.current.isKubernetes}}{{t 'nav.containers.addVolume'}}{{/link-to}}
   {{/containers-header}}
 
   {{#if rows.length}}
@@ -39,6 +39,8 @@
         {{/if}}
       {{/sortable-table}}
     </section>
+  {{else if projectController.projects.current.isKubernetes}}
+    <div class="m-40 text-center text-muted">Coming soon for Kubernetes clusters</div>
   {{else}}
     {{empty-table resource="container" newRoute="volumes.new" newTranslationKey="nav.containers.addVolume"}}
   {{/if}}