added edit link
optional fields marked safe
optional fields marked safe
updated search function
marked required fields