Improving map UX for conditions, #199