Fix component menu order