Fixed last bug (hopefully) with menus being incorrectly displayed