Added fields to user model, updated templates