Refactor ArticleView render
Resolve merge conflicts js files