Fix up the layout with a combo box for the different types we can generate