changed to much simpler window design