Added close button properly