fix layout
new version