Add window popup, split modules