Code cleanup, added new style tray menu