refactor index page, work in progress