[D50][Refactor] (BJ,CP) Refactored layout
Merge branch 'master' of https://github.com/MatthiasFuchs/Webtrobat