updated layout and flow