Added temporary fix for close button