Further work on UI and schema