#759| +Vinay | Adding client side validations
#0| +Vinay | Changing indicator