rolling back
improving the popup menu