fix layouts
layouts were improved