Refactored index page, removing includes