Changed the form data saving functions

The previous way I wrote was a little too
magical so we are now passing the view name
explicitly instead of the inspect way.
Merge branch 'form_data' into andre_dev