made three sections to group buttons into. More can be added later if needed
solved merge issues...now everything should be purty in the Toolbar Panel