Improved interaction with the toggler