Converting to new Form class remaining views