fix toolbar issues