added button in notification, fixed a few bugs