more UI improvement