Moved some windows stuff around