Move to more list-based approach
Added view elements and updated template