Updated to 1.2 with close button