Added support for close buttons in switcher.