Fixed notification badge display, still need to get the realtime working here