Make further improvements to the UI