Added setting to disable click display