Improved popup menu