complete refactoring of all layouts
Merge branch 'master' of https://github.com/schreon/matchmaking