Fixed window size issues