Fixing login logout logic, add notifications