Improved form layout and icon