Changed site build up from included components to chained tags