add notification service and fix layout