Add new form fields
Update the views with better info