Framework change for 4.0 GUI