Did some fixes with the close button