Refactoring and adding list.html