Updating the layout, starting to make a better flow