Fixed menu order issues