Finished Work on Toolbar - Cleanup