Fixed more menu stuff