Merged in custom listviews