[WIP] 63 map viewer enhancements