Minor changes to forms controller/model