Simplify index markup
Simplify article markup