Release preparations
Minor UI tweaks
Merge branch 'release/6.1' into develop