integrating Jan's UI integration

This is Jan's UI integration patch for v1.4 updated to apply v2.0.