Beautify close button and style improvements