Refactor order list view