Fix layout loading
Merge pull request #628 from nicolas-f/layoutfix

Fix layout loading