added fixes for toolbar