some UI fixes for toolbar