#15 #9 #11 ui refinements