fix popups, add new supervisor overlay