Fix fonts
Improve toolbar logic