Enhancement/ui/list view