Changed controls to a table