Improve Customize mode