Tidy up the Connection settings screens in the desktop library

These still need a little tidying up.