Added confirmation box on close
Small improvements