Restructured includes to make HTML pages leaner