- Fix text position
- Fix notification bugs