Feature/screen management

Test