Minor UI changes and reduction of verbosity.