Further improvements to the UI