Settings: Fix and cleanup