Everything is in 1  form

Moved the dropdown box into the same form as the previous stuff. Should
be more organized now.