Updates to Controllers/BackingForms/ViewModels for #225