Changed some more style
Fixed the notification
Fixed merge conflict