Fixed form slightly

Needs JS to top it off