Refactored main list xml