Streamline query builder layout for #46.
Finish improvements to query builder layout, close #46.