Fixed bugs in Screen Management