Fixed some problems with backstack and saving instance state