Feature/embed fix overview