Changes on window behavior