Add more style support and make support for the new changes in popup-menu.