Improvements to TableViewCells and ViewModels