Finalize work on refactoring the Feed Component