Update popup service and controllers