UI improvement related to BZ-1006396