UI updates, WFS "fix", Overlay update