Minor UI change and pylint fix