Refactor Article display