Re-worked the naming of tool tray references and the gui to match the pattern and code structure recently established. It should be much easier to follow, debug, learn, enhance, etc.