Form modifications.

Finally have a basic form I like.