Update with User model
add home template to fix merge conflict