Some changes to apperance and validations