Fix window height, cleanup popup display