notification fixes, backstack fix, diary label changes