Minor setup screen design tweaks