Merge with P best branch & Refactor articles code