Moved city popover into directive