Fixed Close Button Bug