Many fixes and switch cell addition in PListVC