Refactored desktop notifications