Refactor simple index view