Improve the logic of showing the toolbar
Add align-left and align-right icons