Added fields to User model, altered views