o Improve GUI based on QA rounds. Fixes #4041 and #4042.