Map graphic and beacon tweaks