Freshened layout
Merge pull request #2007 from notdryft/sphinx-layout

Freshened layout