change notification page layout and fix bug