Add NavigationDrawer and USb + code cleanup

See commit messages for details