Work in progress cleaning up ux.