Fixing close button styling - closes #3504