Fixed routing and better back button