Refactor CustomLayout to trigger FeedView event instead of direct function call
Fix syntax errors from rebase