Refactor navigation and transitions
Change colors