Update popup templates and controllers