Reworked various forms to better suit the new design.