- Merge previous modification
- Fix a small positioning issue