Separate overlays for popup and modals

Fixes #72