#11 #9 UI refinements