Added state preservation for table views