Added popup plugin, plus multi-window support