Fixed an issue with state not being saved correctly (specifically, top/bottom hidden views)