Move controls into a table for layout