- Correct messages
- Refine UI