Redirect if invalid option
Simplified flow
Merge pull request #109 from praekelt/feature/oneplus-106-back-nav

Feature/oneplus 106 back nav