clean up setup screen a bit