Code cleanup and added new style tray menu