Fixed a few layout inconsistencies with the forms