clean up setup screen a bit
Merge branch 'master' into release-2.0