Refactoret states
Fixed null reference on backPressed in Sherpafy
Added back button on stage favorite
Merge pull request #849 from Bars107/sherpafyrefactor

Refactored states. Fixed null pointer on back pressed.