- UI improvements
- other TODO added