Further progress on index page, work on internal pages