- Optimise imports
- Fix up navigation not working
- Fix navigation drawer icon showing instead of up icon in the action bar
- Other misc changes and fixes