Make the search form a table as discussed.