Page flow correction. Layout correction.

Repair submit prevention to do.