Got some wierd interactions with the back button sorted out