New structure of MainScreen and Tests