minor fixes for toolbar wobbling