restructured views/layouts
Merge branch 'master' into ui