Settings: Improved main settings layout