Improve embeds, fix grids