* Merged Thierry's CSS changes