Added validation error highlighting and several minor changes