Simplified the popup menu markup and style