Cleaned up markup, added better feedback to required fields.