Improve top level menu ordering