query-renderer-new-look - cleanup UI