Update layout & api use