Form improvements

Miscellaneous form improvements, including fixing #75