Refactor template loader, tweak List template