1 - Bug fixes
2 - UI improvements