Fix component ordering