clean up some funky menu interactions