Revert "updated layout and flow"

This reverts commit f3885635d0d9623684478029ee18a483a8a0dac3.