Settings: Shitload of fixes (2/2)