Added testing for notification entry, fixed notification code
Updated layout