fix ordering of components