Updated a crap ton of stuff in order to have field values stay on failed submission. Also added some new form macro helpers