Move TapHandler into toggle block.
Fix Carousel indicator position.