Fixed intentation and fixed the popover's shape