Added close button
Bugfixes