Article template refactor