a few more menu tweaks/optimizations. toolbar button is working great now.