Some Changes, because WindowBuilder fails to parse...