Issue/2107 nav drawer fixes

Fixes #2107 

4.4.4 Screenshot:
![device-2014-12-15-104930](https://cloud.githubusercontent.com/assets/789137/5441768/16308072-8448-11e4-898a-6d5955b01572.png)