Preference screen ui update

>Tidied up the preference screen: had the categories switched to preference screens.

This is just a new version of #436, I added a commit to extract the connection type from the sub-screens. That way users can find it more easily.