layout stuff
...
Merge branch 'feature/v2.0' of github.com:meedan/meedan-nurani into feature/v2.0