display: Clean up screen management code