Reworked the screen flow plan.