Removed list view according to issue #37