Popup menu styling update and bug fixes