remove hard-coded name
update
tweak label positions
tweak