Merge pull request #1 from feg-stuttgart/beta

Update layouts
Merge pull request #2 from feg-stuttgart/master

Merge pull request #1 from feg-stuttgart/beta