Added close button, minor improvements