Improvement on X button