Tidied up list view to not show undefined values