Implemented new home screen
Merged branches together