Updated validations and display options