Index page rework