V2
Merge pull request #2 from Nachbarshund/layoutv2

V2