Fixed some alignment
Changed the display of notification count