Fix notifications bug, and settings bug