Moved components around and into partials