Modified the home screen
Merge remote-tracking branch 'origin/master'
Fixing merge problems