Overview page + templates refactoring