Modular settings, graphics improvements