Refactor index page for users