Revert to older code to show Index landing page
Merge branch 'master' into integrate-phase2