Rearranged QueryBuilder buttons