Re-polluted global namespace, added a few more links to toolbar