Required screens were implemented

and some minor changes