Nav Drawer Overhaul

In the process of overhauling the nav drawer code