Switch to new Navigation Drawer library.
Tidied up code and began resolving bugs.