Client side validation

Client side validation