Simplify HTML for the toolbar
Remove some extra toolbar code