1) cleanup entity controller 2) view user and edit user page