Initial improvement of rendering
Improve rendering of national cards