Rework the newly refactored Feed\Reader component