Got the custom UI elements to work.
Merge branch 'pat'