Updated screen manager