Improve validations and add some text to translations