simplified user model and controllers, adjusted erb in views accordingly to agree