Enhance the index page and seperate as component.