Update Layout
Merge pull request #75 from Bergsocke/developer

Update Layout