New layout stuff

Merge plz before we enter next level of git hell?