WIP refactor index page