Added global level + modal close fix