Removed encryption and added close to tray option