Some modifications in Main Screen