Renamed field names in form
Added remaining fields to form
- separated form details in separate templates