fix layout, fix notify