Added classes for screen management