More work on changing the UI