add popup and icon handling