Fix component hierarchy