fixed the issue with saving
included client side validation
 resolved conflicts