Add some map UX tweaks and error handling

@dougt: r?