Fix for layout and make sure the notification is working properly.