Simplified logic of the articles and altered templates
Change templates, add resources