Improve GUI based on QA rounds
Merge remote-tracking branch 'chiiph/bug/ui_improvements' into develop