Merged in some changes to SimpleForms