Added extra validations and input fields for users