UI Work

Added window close button.
Fixed ui removing bug.