Map UI enchancements