changes by dev119 for toolbar