Bug/various windows fixes