Refactoring code, now support multi-notification bubble