Minor UI change, bug fix