Minor display issues and validation fixed.