added proper relationships to user makeup model