Toolbar fixes with own controller