Fixed menu ordering