update layout
Merge master/master