new layout and fixes
Merge branch 'dev'