Add client side validations
Fixes
Fix validations
Merge branch 'feature/clien_side_val' into develop