#1854 doing some ui work