Cleaning up the menu a bit