bug improvements and further development on the prefilling and workflow of the pages.