Fix some rendering issues
Merge pull request #2 from guillaumebort/master

Fix some rendering issues