Fixed menu and saving bugs