modifications to toolbar for elminiatng redundancy and fixing up things