Improved appearance of notification badge
Refactoring