First pass at making the back button work