Fixed namespace an a couple viewmodels