Started refactoring feed view