Added basic screen management