Prevent Exception when no CurrentWindow, new topbar style, cleaning