custom listview for machine lists
Merge branch 'enhancements'