fixed problem with close-button
changes some messages