r1549 + note two new UI options