edited user controller
edited user controller
changed makeup controller