Bug Fix:  window_width/height were not returning proper numbers