Remove unneeded tenses, cleaning up form element layout