Adjust flow and layout