Fix toolbar issues