Some new ui and validations and etc