ui update and minor bug fix