Fix look&feel for popup menu. Code cleanup.

Popup menu is not displayed on all desktops now.