fixes for toolbar