Made query list a data-bound view to the query model
Bootstrap layout changes
Moved test model to external file
Added recaptioning of aggregated fields