Updated ClientEditListRowGenerator