Restore back button and tidy UI