[VIEW] Refactored index view