Refactored index page