updated layouts
Merge branch 'luka'