- Improve lay-out
- Special characters in separate window
