Cleaned up the list_view a little