Popup containers

Solves #159