Tidied up the Drawer Nav