Modifications to User models, views