Refactor and fix for old browser who don't understand a form in table (and also because it's not valid HTML)