Added a Context Menu to the tray + Code cleanup