1) Fix view/edit layout 2) Improve notification appearance