Finished the tool bar. Removed the mistakenly-pushed test code.