Removed Markup, added viewmodel extensions