Unit popup got some love