misc. clean up
made toolbar a template