Simplifying the customizer options
bugfixes