fix notification, fix ui, improve ui