Tweak query builder CSS to maximize space usage
Revert accidental deletion of base template block
Change API client name to query builder