Major changes to the stop_window UI