#JC-1275 user interface improvements