Some more grid tweaks. Getting started on the basic query builder