changes to the edit page for field validation messages
final changes
merge