Settings Window checked in with bug fixes for "Window not opening"