Popovers should not overlap the menu bar

Also eliminated redundant code in CPMenu -menuBarHeight