Modular page structure
CSS cleanup
Merge branch 'Treemap'