Code review fixes
Local notifications fixes, updated scroll