Updated form HTML to make it look a bit less bad