Join 2 articles public form views into one for sake of DRY

Solves #336