Update flow, layout