More fixes for the customize menu settings

This should be the last changes, everything works as it should.