Bit of cleanup, use buttonish Start Mapping link from popup