Refactor CommandListPopup