WIP: removing the custom UI