icon for query builder button and some re-arranging