Minor cleanups to the UI