have extra layers in popup, refactored to active workspace view