Changed the look of the form and modified some tests.