Two step form

Now two steps before preparation report screen