Updated form error highlight to note required fields and simplified the whole template [MJ-857]