Index page refactoring