More work on the UI