Rearranged the lements of the form and styled it a bit better