Final cleanups to try and improve the look of the UI somewhat.