Tidy up of settings screen