fix back button and start state issues