Added list view, as well as refactored form