New layout

I'm opening this PR to preview & discuss @milenasp's work.