Fixing Create/Edit Assessment ViewModel: Part 1