Lots of changes in View. Started amending form helpers