Few Ui Window fixes