Changed addition and removal of subviews to hiding and showing to avoid issues with accessing freed resources on subview removal