Improved form layout and added screenshots