much better close button and modifications