Rendering fixes
Merge pull request #249 from obiba/rendering-fixes

Rendering fixes