Update layout for 2.4
Fix typo
Merge pull request #16 from nilshoerrmann/integration

Update layout for 2.4