Improve embedding page