Reworking pop out windows

This is something I need to deal with as well.