Bring User settings into line with Core (and rationalise tabs)