diff --git a/ionic/components/button/button-fab.scss b/ionic/components/button/button-fab.scss
index 62909c3b16..31bbb991f6 100644
--- a/ionic/components/button/button-fab.scss
+++ b/ionic/components/button/button-fab.scss
@@ -2,7 +2,8 @@
 // FABulous Buttons (Floating Action Button from material)
 // --------------------------------------------------
 
-$button-fab-size:                 56px;
+$button-fab-size:           56px !default;
+$button-fab-box-shadow:     0 4px 6px 0 rgba(0, 0, 0, 0.14), 0 4px 5px rgba(0, 0, 0, 0.1) !default;
 
 
 button,
@@ -15,6 +16,7 @@ button,
     line-height: $button-fab-size;
     min-width: 0;
     vertical-align: middle;
+    box-shadow: $button-fab-box-shadow !important;
 
     border-radius: 50%;
     background-clip: padding-box;
@@ -30,15 +32,19 @@ button,
       left: 50%;
       margin-left: -$button-fab-size / 2;
     }
+
     &[fab-top] {
       top: 16px;
     }
+
     &[fab-right] {
       right: 16px;
     }
+
     &[fab-bottom] {
       bottom: 16px;
     }
+
     &[fab-left] {
       left: 16px;
     }
@@ -48,6 +54,7 @@ button,
       font-size: 3.6rem;
       min-width: 64px;
     }
+
   }
 
 }
diff --git a/ionic/components/nav/nav-push.ts b/ionic/components/nav/nav-push.ts
index 2db638c4b1..2f6e5def7b 100644
--- a/ionic/components/nav/nav-push.ts
+++ b/ionic/components/nav/nav-push.ts
@@ -1,4 +1,4 @@
-import {Directive} from 'angular2/angular2';
+import {Directive, Optional} from 'angular2/angular2';
 import {NavController} from './nav-controller';
 import {NavRegistry} from './nav-registry';
 
@@ -21,9 +21,12 @@ export class NavPush {
    * TODO
    * @param {NavController} nav  TODO
    */
-  constructor(nav: NavController, registry: NavRegistry) {
+  constructor(@Optional() nav: NavController, registry: NavRegistry) {
     this.nav = nav;
     this.registry = registry;
+    if (!nav) {
+      console.error('nav-push must be within a NavController');
+    }
   }
 
   onClick() {
@@ -64,8 +67,11 @@ export class NavPop {
    * TODO
    * @param {NavController} nav  TODO
    */
-  constructor(nav: NavController) {
+  constructor(@Optional() nav: NavController) {
     this.nav = nav;
+    if (!nav) {
+      console.error('nav-pop must be within a NavController');
+    }
   }
   onClick() {
     this.nav && this.nav.pop();