Adding the form fields view
Tidy up