fix layout_ver2
fix new layout