Fixed toolbar issues