Setup Screens tweaks