Complete transition to item_layout