Updated, Bug fixes for Button click event to not have validation on un-required field