type hierarchy edits
margin edits for smaller viewports
Merge branch 'master' into gh-pages