rearranged the shaxpir toolbar, and added new 'comment' button icons