fix #40 and update UI (#41)