Added wdiget icon UI
Some cleanup and added TB submenu support