Fixed minor bugs from Matts commit.

I forgot to tell you i changed the name of a couple formdivs. Its all
fixed now.