Rewrite intro
Merge branch 'design' into style-side-by-side