updated FormView
Merge remote-tracking branch 'Drew/master'
Update 1