Moved a couple components