Merge "Adapted the no notifications view according to spec"