General Clean up and slight improvements

Switched to use instanceType rather than id when creating the drawerController which allows for better type checking.
Removed some unneeded code.