More work on the new design.  It works for grids, but not for images. 
Clean up some redundant/unused code in DataSelectionWidget.