new popup impl complete

did some janitorial work aswell