Changed home-screen layout
Changed overall layout