Fixing a few things in the menu