Reorganized the main ViewModel being attached to the View - some helper form functions too