Clean layout
Merge branch 'dev'

Fix build.