Fix for close button and button method ussing \!isset instead of empty