Better contrast on conditional text, and more 'padding' in map view