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