Updated markup structure on article component