Add: better PM windows management