sync && fix layout