Add validations to user model
Small fix
Simplify app