index pages and article pages refactored