Tweak the set comprehensions
LocationSelectorWidget2: MapIcon -> Button. Fix S3SliderWidget.