Update screens for notification and home
Merge branch 'notificationscreen'