Small UI fixes.
Merge remote-tracking branch 'origin/wc13_before_deploy_fixes_01'
Fixing the merge