updating main site to provide better core site experience
refactoring the responsible chapter code