Made design a cleaner by isolating Window stuff.