Inefficient spacing issues when displaying query headers

The relation of the query to the bullet looks like a mistake. In addition the controls above the query are inefficiently spaced. Here’s a mock with the existing layout on the left and a proposed one on the right.