Improve task toggle (specialy in future tab
coding standards