UI improvements

commit msgs explain the changes