Several changes to window