fix some notification issue
fixed some layout issue
clean up