Updated SetupWindow