more UI touchup