Tweaked PopUP a bit