Dont blow away the DOM. Closes #609
Fix the styling of the toolbar