Fixed tragic menu bug (now less tragic, but still bug)