started working on layout
Merge branch 'master' of https://github.com/aleitner/Standard-Code-concept