Added optional Close button