Changed the way Home.screen works (step 1)