new menu icon and some clean up