Adding "tabs" to the settings, and small security fixes.