working on popover
added some stuff to popover
have extra layers in popup, refactored to active workspace view
merge conflicts resolved
merge conflicts resolved