Update to custom controls framework