More work on the UI stuff