A little more work on Web UI rework