Reduced the amount of times windows are rearranged. #23