Canvas container style fixes
Merge branch 'master' of https://github.com/BlueprintDevTeam/paritaire

merging