Change layout
Adding tests and validations for users