Added list view and two seperate template files