Improve embed display and collections