reworked UI per feedback from DH