Badge number and notification improvements