Navigation Drawer

Fixes