Settings: fix and cleanup