Updates to clean up query builder UI

Still need to fix issue with showing edit controls