Added call to form and list, split the views to reduce repetitive html code