Refactor ArticleView render round 2