Table fix and VC segue state fix